From 51eb69b5124cf3ab9c7b28568271ec5fd03ab4d8 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 30 Sep 2022 13:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 3 +- .../fin/api/kingdee/FinKingDeeFeign.java | 12 +- .../api/kingdee/FinKingDeeFeignFallBack.java | 10 +- .../anrui/fin/api/kingdee/KingDeeCode.java | 29 +++ .../fin/api/kingdee/appayable/APPayable.java | 2 + .../fin/api/kingdee/appaybill/ApPayBill.java | 140 ++++++++----- .../kingdee/arreceivable/ARReceivable.java | 3 +- .../api/kingdee/bdcustomer/BdCustomer.java | 5 + .../api/kingdee/bdmaterial/BdMaterial.java | 76 +++++-- .../fin/api/kingdee/bdstock/BDStock.java | 6 +- .../orgorganizations/OrgOrganizations.java | 4 +- .../api/kingdee/saloutstock/SalOutStock.java | 51 ++++- .../api/kingdee/stkinstock/StkInStock.java | 5 + .../stktransferdirect/StkTransferDirect.java | 39 ++-- .../FinPaymentrecordService.java | 19 +- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 24 +-- .../fin/biz/kingdee/FinKingDeeService.java | 122 +++++++++++ .../fin/biz/kingdee/appayable/data_model.json | 1 + .../ApPayBillCastToKingDeeBillFields.java | 1 + .../kingdee/appaybill/ApPayBillService.java | 20 ++ .../kingdee/appaybill/data_FPAYBILLENTRY.json | 4 +- .../fin/biz/kingdee/appaybill/data_model.json | 1 + .../biz/kingdee/bdcustomer/data_model.json | 1 + .../BdMaterialCastToKingDeeBillFields.java | 1 + .../kingdee/bdmaterial/BdMaterialService.java | 189 ++++++++++++------ .../biz/kingdee/bdmaterial/data_model.json | 1 + .../fin/biz/kingdee/bdstock/data_model.json | 1 + .../kingdee/orgorganizations/data_model.json | 3 +- .../kingdee/receivablebill/data_model.json | 1 + .../SalOutStockCastToKingDeeBillFields.java | 6 + .../biz/kingdee/saloutstock/data_FEntity.json | 6 +- .../biz/kingdee/saloutstock/data_model.json | 6 + .../kingdee/stkinstock/STKInStockService.java | 11 +- .../stkinstock/data_FInStockEntry.json | 3 +- .../kingdee/stktransferdirect/data_model.json | 3 +- .../yxt/anrui/fin/biz/timer/TimerUtil.java | 29 +++ .../api/sysmapping/SysMappingFeign.java | 11 +- .../sysmapping/SysMappingFeignFallback.java | 6 + .../sysmapping/SysMappingInfoQueryBatch.java | 27 +++ .../portal/biz/sysmapping/SysMappingRest.java | 8 + .../biz/sysmapping/SysMappingService.java | 25 +++ .../ScmApplyInboundService.java | 8 +- 42 files changed, 712 insertions(+), 211 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 37dd7e30e6..b9e306483d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -508,7 +508,8 @@ public class BaseAccadjApplyService extends MybatisBaseService draftSalOutStock(@RequestBody SalOutStock salOutStock) ; @ApiOperation("暂存物料的接口") - @PostMapping("/draftBdMaterial") - @ResponseBody - public ResultBean draftBdMaterial(@RequestBody BdMaterial bdMaterial) ; - @ApiOperation("保存物料的接口") - @PostMapping("/saveBdMaterial") - @ResponseBody - public ResultBean saveBdMaterial(@RequestBody BdMaterial bdMaterial) ; - @ApiOperation("暂存物料的接口") @PostMapping("/draftBdMaterialList") @ResponseBody public ResultBean draftBdMaterialList(@RequestBody List bdMaterial) ; + @ApiOperation("批量修改物料的接口") + @PostMapping("/saveBdMaterialList") + @ResponseBody + public ResultBean saveBdMaterialList(@RequestBody List bdMaterial) ; @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftStkTransferDirect") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index 608c0968b9..82d9f79415 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -48,17 +48,13 @@ implements FinKingDeeFeign{ public ResultBean draftSalOutStock(SalOutStock salOutStock) { return null; } - - @Override - public ResultBean draftBdMaterial(BdMaterial bdMaterial) { - return null; - } @Override - public ResultBean saveBdMaterial(BdMaterial bdMaterial) { + public ResultBean draftBdMaterialList(List bdMaterial) { return null; } + @Override - public ResultBean draftBdMaterialList(List bdMaterial) { + public ResultBean saveBdMaterialList(List bdMaterial) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java new file mode 100644 index 0000000000..f66c4e2911 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeCode.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.fin.api.kingdee; + +/** + * 封装金蝶接口调用后返回给业务的code值 + */ +public enum KingDeeCode { + REPEAT("5001","违反唯一性约束"), + SUBMIT("5002","提交失败"), + AUDIT("5003","审核失败"), + ALLOCATE("5004","分配失败"), + NOTEXIST("5005","关键值不存在"), + UNAUDIT("5006","反审核失败"), + ERROR("5000","接口调用失败"); + private String code; + private String msg; + + KingDeeCode(String code, String msg) { + this.code = code; + this.msg = msg; + } + + public String getCode() { + return code; + } + + public String getMsg() { + return msg; + } +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java index a0c4fc5119..bfd42ade0a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appayable/APPayable.java @@ -96,6 +96,8 @@ public class APPayable { @ApiModelProperty("车辆台数") public String num; + @ApiModelProperty("备注") + public String FAP_Remark; @ApiModelProperty("车辆列表") public List vehicleList; @Data diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index 027a43f1af..e3c6291c4e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -14,10 +14,42 @@ import java.util.List; @Data public class ApPayBill { - @JsonProperty("FDATE") - @NotBlank - //业务日期:FDATE (必填项) - public String FDATE; + @JsonProperty("FDATE") + @NotBlank + //业务日期:FDATE (必填项) + public String FDATE; + @JsonProperty("FRECTUNIT") + @NotBlank + //收款单位:FRECTUNIT (必填项) + public String FRECTUNIT ; + @NotBlank + //采购组织:FPURCHASEORGID + public String FPURCHASEORGID ; + @JsonProperty("FPURCHASEDEPTID") + @NotBlank + //采购部门:FPURCHASEDEPTID(必填项) + public String FPURCHASEDEPTID ; + /*@JsonProperty("F_PAEZ_Assistant") + @NotBlank + //应付类别:F_PAEZ_Assistant (必填项) 默认：005 定金 + public String F_PAEZ_Assistant="005";*/ + /** + * //应付类别:F_PAEZ_AssistantType (必填项) 默认：005 定金 + */ + @JsonProperty("F_PAEZ_AssistantType") + @NotBlank + public String F_PAEZ_AssistantType; + /** + * //应付类别:F_PAEZ_AssistantKey (必填项) 默认：005 定金 + */ + @JsonProperty("F_PAEZ_Assistant") + @NotBlank + public String F_PAEZ_AssistantKey; + /** + * //备注:FREMARK + */ + @JsonProperty("FREMARK") + public String FREMARK; /* @JsonProperty("FCONTACTUNITTYPE") @NotBlank //往来单位类型:FCONTACTUNITTYPE (必填项) @@ -30,49 +62,75 @@ public class ApPayBill { @NotBlank //收款单位类型:FRECTUNITTYPE (必填项) public String FRECTUNITTYPE="BD_Supplier";*/ - @JsonProperty("FRECTUNIT") - @NotBlank - //收款单位:FRECTUNIT (必填项) - public String FRECTUNIT ; + /* @JsonProperty("FSETTLEORGID") @NotBlank*/ //结算组织:FSETTLEORGID (必填项) /*public String FSETTLEORGID ; @JsonProperty("FPURCHASEORGID")*/ - @NotBlank - //采购组织:FPURCHASEORGID - public String FPURCHASEORGID ; - @JsonProperty("FPURCHASEDEPTID") - @NotBlank - //采购部门:FPURCHASEDEPTID(必填项) - public String FPURCHASEDEPTID ; /* @JsonProperty("FPAYORGID") @NotBlank*/ //付款组织:FPAYORGID (必填项) /* public String FPAYORGID ;*/ - @JsonProperty("F_PAEZ_Assistant") - @NotBlank - //应付类别:F_PAEZ_Assistant (必填项) 默认：005 定金 - public String F_PAEZ_Assistant="005"; @JsonProperty("FPAYBILLENTRY") @NotBlank public List FPAYBILLENTRY=new ArrayList<>(); @Data public static class FPAYBILLENTRY{ - /** - * 结算方式:FSETTLETYPEID (必填项) - */ - @JsonProperty("FSETTLETYPEID") - @NotBlank - public String FSETTLETYPEID="02"; - //付款用途:FPURPOSEID (必填项) SFKYT08_SYS：采购付款 SFKYT09_SYS：预付款 - @JsonProperty("FPURPOSEID") - @NotBlank - public String FPURPOSEID; - @JsonProperty("FPAYTOTALAMOUNTFOR") - @NotBlank - //表体-应付金额:FPAYTOTALAMOUNTFOR - public double FPAYTOTALAMOUNTFOR; + /** + * 结算方式:FSETTLETYPEID (必填项) + */ + /* @JsonProperty("FSETTLETYPEID") + @NotBlank + public String FSETTLETYPEID;*/ + /** + * 结算方式:FSETTLETYPEIDKey (必填项) + */ + @JsonProperty("FSETTLETYPEIDKey") + @NotBlank + public String FSETTLETYPEIDKey; + /** + * 结算方式:FSETTLETYPEIDType (必填项) + */ + @JsonProperty("FSETTLETYPEIDType") + @NotBlank + public String FSETTLETYPEIDType; + //付款用途:FPURPOSEID (必填项) SFKYT08_SYS：采购付款 SFKYT09_SYS：预付款 + /*@JsonProperty("FPURPOSEID") + @NotBlank + public String FPURPOSEID;*/ + /** + * 付款用途:FPURPOSEIDType (必填项) SFKYT08_SYS：采购付款 SFKYT09_SYS：预付款 + */ + @JsonProperty("FPURPOSEIDType") + @NotBlank + public String FPURPOSEIDType; + /** + * 付款用途:FPURPOSEIDKey (必填项) SFKYT08_SYS：采购付款 SFKYT09_SYS：预付款 + */ + @JsonProperty("FPURPOSEIDKey") + @NotBlank + public String FPURPOSEIDKey; + @JsonProperty("FPAYTOTALAMOUNTFOR") + @NotBlank + //表体-应付金额:FPAYTOTALAMOUNTFOR + public double FPAYTOTALAMOUNTFOR; + @JsonProperty("FACCOUNTID") + @NotBlank + //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录 + public String FACCOUNTID; + @JsonProperty("FPOSTDATE") + @NotBlank + //登账日期:FPOSTDATE (必填项) + public String FPOSTDATE; + /* @JsonProperty("FRuZhangType") + @NotBlank + //入账类型:FRuZhangType (必填项) + public String FRuZhangType="1";*/ + /* @JsonProperty("FPayType") + @NotBlank + //支付类型:FPayType (必填项) + public String FPayType;*/ /* @JsonProperty("FPAYAMOUNTFOR_E") @NotBlank*/ //付款金额:FPAYAMOUNTFOR_E @@ -89,22 +147,6 @@ public class ApPayBill { @NotBlank*/ //付款金额本位币:FPAYAMOUNT_E /* public double FPAYAMOUNT_E;*/ - @JsonProperty("FACCOUNTID") - @NotBlank - //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录 - public String FACCOUNTID; - @JsonProperty("FPOSTDATE") - @NotBlank - //登账日期:FPOSTDATE (必填项) - public String FPOSTDATE; - @JsonProperty("FRuZhangType") - @NotBlank - //入账类型:FRuZhangType (必填项) - public String FRuZhangType="1"; - @JsonProperty("FPayType") - @NotBlank - //支付类型:FPayType (必填项) - public String FPayType; } public final static ApPayBill apPayBill = new ApPayBill(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java index aa3cf24dfa..8f35eb7f46 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivable/ARReceivable.java @@ -97,7 +97,8 @@ public class ARReceivable { public String num; @ApiModelProperty("客户ID") public String fcustomerid; - + @ApiModelProperty("FAR_Remark") + public String FAR_Remark; @ApiModelProperty("车辆列表") public List vehicleList; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java index 832ef9a9c6..b4d2376c16 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java @@ -24,6 +24,11 @@ public class BdCustomer { @JsonProperty("TOrgId") @NotBlank public String TOrgIds; + /** + * 备注 + */ + @JsonProperty("FDescription") + public String FDescription; public final static BdCustomer bdCustomer = new BdCustomer(); static { /* 创建组织:FCreateOrgId (必填项)*/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java index 906fef870f..e9a49109a0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java @@ -21,16 +21,6 @@ public class BdMaterial { */ @JsonProperty("oldFName") public String oldFName; - /** - *创建组织:FCreateOrgId (必填项) - */ - // @JsonProperty("FCreateOrgId") - // public String FCreateOrgId; - /** - *使用组织:FUseOrgId (必填项) - */ - // @JsonProperty("FUseOrgId") - // public String FUseOrgId; /** *名称:FName (必填项) */ @@ -40,22 +30,72 @@ public class BdMaterial { /** *物料分组:FMaterialGroup (必填项) */ - @NotBlank(message = "物料分组:FMaterialGroup (必填项)") + /*@NotBlank(message = "物料分组:FMaterialGroup (必填项)") @JsonProperty("FMaterialGroup") - public String FMaterialGroup; - + public String FMaterialGroup;*/ + @NotBlank(message = "物料分组:FMaterialGroupType (必填项)") + @JsonProperty("FMaterialGroupType") + public String FMaterialGroupType; + @NotBlank(message = "物料分组:FMaterialGroupKey (必填项)") + @JsonProperty("FMaterialGroupKey") + public String FMaterialGroupKey; /** *车辆类型:F_PAEZ_Base (必填项) */ - @NotBlank(message = "车辆类型:F_PAEZ_Base ") + /*@NotBlank(message = "车辆类型:F_PAEZ_Base ") @JsonProperty("F_PAEZ_Base") - public String F_PAEZ_Base; + public String F_PAEZ_Base;*/ + @NotBlank(message = "车辆类型:F_PAEZ_BaseType ") + @JsonProperty("F_PAEZ_BaseType") + public String F_PAEZ_BaseType; + @NotBlank(message = "车辆类型:F_PAEZ_BaseKey ") + @JsonProperty("F_PAEZ_BaseKey") + public String F_PAEZ_BaseKey; + @NotBlank(message = "车辆系别:F_PAEZ_Base2Type ") + @JsonProperty("F_PAEZ_Base2Type") + public String F_PAEZ_Base2Type; + @NotBlank(message = "车辆系别:F_PAEZ_Base2Key ") + @JsonProperty("F_PAEZ_Base2Key") + public String F_PAEZ_Base2Key; + @NotBlank(message = "车辆马力:F_PAEZ_Base3Key ") + @JsonProperty("F_PAEZ_Base3Key") + public String F_PAEZ_Base3Key; + @NotBlank(message = "车辆马力:F_PAEZ_Base3Type ") + @JsonProperty("F_PAEZ_Base3Type") + public String F_PAEZ_Base3Type; + @NotBlank(message = "车辆驱动:F_PAEZ_Base4Type ") + @JsonProperty("F_PAEZ_Base4Type") + public String F_PAEZ_Base4Type; + @NotBlank(message = "车辆驱动:F_PAEZ_Base4Key ") + @JsonProperty("F_PAEZ_Base4Key") + public String F_PAEZ_Base4Key; + /** + * 备注描述 + */ + @JsonProperty("FDescription") + public String FDescription; + /** + *创建组织:FCreateOrgId (必填项) + */ + // @JsonProperty("FCreateOrgId") + // public String FCreateOrgId; + /** + *使用组织:FUseOrgId (必填项) + */ + // @JsonProperty("FUseOrgId") + // public String FUseOrgId; /** *存货类别:FCategoryID (必填项) */ - /* @NotBlank(message = "存货类别:FCategoryID ") + /*@NotBlank(message = "存货类别:FCategoryID ") @JsonProperty("FCategoryID") - public String FCategoryID="CHLB01_SYS";*/ + public String FCategoryID;*/ + @NotBlank(message = "存货类别:FCategoryIDKey ") + @JsonProperty("FCategoryIDKey") + public String FCategoryIDKey; + @NotBlank(message = "存货类别:FCategoryIDType") + @JsonProperty("FCategoryIDType") + public String FCategoryIDType; public final static BdMaterial bdMaterial = new BdMaterial(); static { /** @@ -81,7 +121,7 @@ public class BdMaterial { /** * 车辆类型:F_PAEZ_Base (必填项) */ - bdMaterial.setF_PAEZ_Base("02"); + /*bdMaterial.setF_PAEZ_Base("02");*/ } public static BdMaterial createBdMaterial() { return bdMaterial; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java index 67403d318c..211c4c7289 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java @@ -30,7 +30,11 @@ public class BDStock implements Serializable { @JsonProperty("FName") @NotBlank private String FName; - + /** + * 备注 + */ + @JsonProperty("FStockProperty") + private String FStockProperty; /** * 分配的分公司的id:TOrgIds (必填项) */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java index a4b6d7543f..f754a780c5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java @@ -22,7 +22,9 @@ public class OrgOrganizations { @JsonProperty("FOrgFormID") @NotBlank public String FOrgFormID; - + /*描述:FDescription*/ + @JsonProperty("FDescription") + public String FDescription; public final static OrgOrganizations orgOrganizations = new OrgOrganizations(); static { /*名称:FName (必填项)*/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java index 62c4cabeb0..05ec75e94b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java @@ -44,9 +44,34 @@ public class SalOutStock { // public String FPayerID; /** * 项目类别:F_PAEZ_Assistant 调账时项目类别集团内部调车034 - */ @JsonProperty("F_PAEZ_Assistant") + */ + /*@JsonProperty("F_PAEZ_Assistant") + @NotBlank + public String F_PAEZ_Assistant;*/ + /** + * 项目类别:F_PAEZ_AssistantType 调账时项目类别集团内部调车034 + */ + @JsonProperty("F_PAEZ_AssistantType") + @NotBlank + public String F_PAEZ_AssistantType; + /** + * 项目类别:F_PAEZ_AssistantKey 调账时项目类别集团内部调车034 + */ + @JsonProperty("F_PAEZ_AssistantKey") + @NotBlank + public String F_PAEZ_AssistantKey; + /** + * 业务员:F_PAEZ_Base1 + */ + @JsonProperty("F_PAEZ_Base1") @NotBlank - public String F_PAEZ_Assistant="00"; + public String F_PAEZ_Base1; + /** + * 中介单位:F_PAEZ_Base + */ + @JsonProperty("F_PAEZ_Base") + @NotBlank + public String F_PAEZ_Base; /** * 物料列表 */ @@ -102,6 +127,28 @@ public class SalOutStock { */ @JsonProperty("FSalUnitID") @NotBlank public String FSalUnitID; + /** + * 销售折让:F_PAEZ_Decimal3 + */ @JsonProperty("F_PAEZ_Decimal3") + @NotBlank + public String F_PAEZ_Decimal3; + /** + * 赠送套餐:F_PAEZ_Decimal4 + */ @JsonProperty("F_PAEZ_Decimal4") + @NotBlank + public String F_PAEZ_Decimal4; + /** + * 返利金额:F_PAEZ_Decimal + */ + @JsonProperty("F_PAEZ_Decimal") + @NotBlank + public String F_PAEZ_Decimal; + /** + * 备注:FEntrynote + */ + @JsonProperty("FEntrynote") + @NotBlank + public String FEntrynote; } public final static SalOutStock salOutStock = new SalOutStock(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java index 1a36ea4bf7..e3c1c26566 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java @@ -136,6 +136,11 @@ public class StkInStock { */@JsonProperty("FStockId") @NotBlank public String FStockId; + /** + * 备注 + */ + @JsonProperty("FNote") + public String FNote; } public final static StkInStock stkInStock = new StkInStock(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index ead3f590f9..acb2a7a170 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -25,6 +25,14 @@ public class StkTransferDirect { @JsonProperty("FDestStockId") @NotBlank public String FDestStockId; + /* 物料编码:FMaterialId (必填项)*/ + @JsonProperty("FMaterialId") + @NotBlank + public String FMaterialId; + /* 调出仓库:FSrcStockId (必填项)*/ + @JsonProperty("FSrcStockId") + @NotBlank + public String FSrcStockId; /*调出库存状态:FSrcStockStatusId (必填项)*/ /* @JsonProperty("FSrcStockStatusId") @NotBlank @@ -81,14 +89,6 @@ public class StkTransferDirect { // @JsonProperty("FUnitID") // @NotBlank //public String FUnitID; - /* 物料编码:FMaterialId (必填项)*/ - @JsonProperty("FMaterialId") - @NotBlank - public String FMaterialId; - /* 调出仓库:FSrcStockId (必填项)*/ - @JsonProperty("FSrcStockId") - @NotBlank - public String FSrcStockId; } /* 调入货主:FOwnerIdHead (必填项)*/ @JsonProperty("FOwnerIdHead") @@ -98,6 +98,19 @@ public class StkTransferDirect { @JsonProperty("FStockOutOrgId") @NotBlank public String FStockOutOrgId; + /* 调入库存组织:FStockOrgId (必填项)*/ + @JsonProperty("FStockOrgId") + @NotBlank + public String FStockOrgId; + /* 日期:FDate (必填项)*/ + @JsonProperty("FDate") + @NotBlank + public String FDate; + /** + * 备注 + */ + @JsonProperty("FNote") + public String FNote; /* 调拨类型:FTransferBizType (必填项)*/ /*@JsonProperty("FTransferBizType") @NotBlank @@ -110,10 +123,6 @@ public class StkTransferDirect { /*@JsonProperty("FOwnerTypeOutIdHead") @NotBlank public String FOwnerTypeOutIdHead;*/ - /* 调入库存组织:FStockOrgId (必填项)*/ - @JsonProperty("FStockOrgId") - @NotBlank - public String FStockOrgId; /* 调入货主类型:FOwnerTypeIdHead (必填项)*/ /*@JsonProperty("FOwnerTypeIdHead") @NotBlank @@ -122,19 +131,13 @@ public class StkTransferDirect { /*@JsonProperty("FBillTypeID") @NotBlank public String FBillTypeID;*/ - /* 日期:FDate (必填项)*/ - @JsonProperty("FDate") - @NotBlank - public String FDate; /** * FBillEntry */ @JsonProperty("FBillEntry") @NotBlank public List FBillEntry=new ArrayList<>(); - public final static StkTransferDirect stkTransferDirect = new StkTransferDirect(); - static { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date=new Date(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 69b74c52df..875a90f50a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -192,7 +192,8 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); @@ -203,25 +204,25 @@ public class FinPaymentrecordService extends MybatisBaseService draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) { return salOutStockService.draftSalOutStock(salOutStock); } - @ApiOperation("暂存物料的接口") - @PostMapping("/draftBdMaterial") - @ResponseBody - @Override - public ResultBean draftBdMaterial(@RequestBody @Valid BdMaterial bdMaterial) { - return bdMaterialService.draftBdMaterial(bdMaterial); - } - @ApiOperation("暂存物料的接口") - @PostMapping("/saveBdMaterial") - @ResponseBody - @Override - public ResultBean saveBdMaterial(@RequestBody @Valid BdMaterial bdMaterial) { - return bdMaterialService.saveBdMaterial(bdMaterial); - } - - @ApiOperation("暂存物料的接口") + @ApiOperation("批量暂存物料的接口") @PostMapping("/draftBdMaterialList") @ResponseBody @Override public ResultBean draftBdMaterialList(@RequestBody @Valid List bdMaterial) { return bdMaterialService.draftBdMaterialList(bdMaterial); } + @ApiOperation("批量修改物料的接口") + @PostMapping("/saveBdMaterialList") + @ResponseBody + @Override + public ResultBean saveBdMaterialList(@RequestBody @Valid List bdMaterial) { + return bdMaterialService.saveBdMaterialList(bdMaterial); + } @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftStkTransferDirect") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java index 6242449831..6f9d906d2f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java @@ -3,10 +3,13 @@ package com.yxt.anrui.fin.biz.kingdee; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; +import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -21,6 +24,8 @@ import java.util.Map; @Service public class FinKingDeeService { public static final Logger log = LoggerFactory.getLogger(FinKingDeeService.class); + @Autowired + private SysMappingFeign sysMappingFeign; /** * 调用金蝶的保存接口 * @param data @@ -175,7 +180,89 @@ public class FinKingDeeService { s=s.substring(0,s.length()-1); return s; } + /** + * 获取映射的数据字典的参数 + * @param sysMappingInfoQuerys + * @return + */ + public ResultBean> getMappingInfosParams(List>> sysMappingInfoQuerys) { + return sysMappingFeign.selectMappingInfoBatch(sysMappingInfoQuerys); + } + /** + * 映射的参数 + * @param maps + * @param idKey 映射的实体类具有唯一标识的字段 + * @return + */ + public List>> makeMappingInfosParams(List< Map> maps, + List keys,String idKey, + String mapObject,String mapSourceKey) { + List>> list=new ArrayList<>(); + for( Map stringObjectMap: maps) { + //物料信息转map参数 + //业务表的主表数据集合 + Map map_fEntityModel_ = createMapParams(stringObjectMap); + List dictValueAndCode = getDictValueAndCode(map_fEntityModel_,keys,mapObject,mapSourceKey); + Map> m=new HashMap<>(); + m.put(stringObjectMap.get(idKey).toString(),dictValueAndCode); + list.add(m); + } + return list; + } + private List getDictValueAndCode(Map map_fEntityModel_,List keys, + String mapObject,String mapSourceKey) { + List sysMappingInfoQuerys=new ArrayList<>(); + for(KeyItem ki:keys){ + String key = ki.getKey(); + String item = ki.getItem(); + String FCategoryIDType = map_fEntityModel_.get(key+"Type"); + String FCategoryIDKey = map_fEntityModel_.get(key+"Key"); + sysMappingInfoQuerys.add(getDictValueAndCodeBatch(FCategoryIDType,FCategoryIDKey,item,mapObject,mapSourceKey)); + } + return sysMappingInfoQuerys; + } + private SysMappingInfoQueryBatch getDictValueAndCodeBatch(String DictTypeType,String DictKey,String Map_item,String mapObject,String mapSourceKey) { + SysMappingInfoQueryBatch sysMappingInfoQuery = new SysMappingInfoQueryBatch(); + sysMappingInfoQuery.setMap_object("物料"); + sysMappingInfoQuery.setMap_sourceKey("CWXT"); + sysMappingInfoQuery.setDictTypeCode(DictTypeType); + sysMappingInfoQuery.setDictKey(DictKey); + sysMappingInfoQuery.setMap_item(Map_item); + return sysMappingInfoQuery; + } + /** + * 向物料的实体对象上设置查询回来的映射的数据字典的参数 + * @param map_fEntityModel_ + * @param data + * @return + */ + public ResultBean< String> setMappingInfosParams(Map map_fEntityModel_, Map data,List kis){ + ResultBean< String> rb=ResultBean.fireFail(); + for(Map.Entry entry : data.entrySet()){ + Object value = entry.getValue(); + if(value==null){ + log.info("物料映射表不存在值！"); + return rb.setMsg("物料映射表不存在值！"); + } + JSONArray jsonArray=JSONArray.parseArray(JSONObject.toJSONString(entry.getValue())); + for(int i=0;i { + if(map_item.equals(keyItem.getItem())){ + map_fEntityModel_.put(keyItem.getKey(),map_itemKey.toString()); + } + }); + } + } + return rb.success(); + } /** * 调用金蝶接口的数据格式 */ @@ -241,4 +328,39 @@ public class FinKingDeeService { return data; } } + + /** + * 封装获取映射的参数的值的时候的实体类的字段 + */ + public class KeyItem{ + public KeyItem(String key, String item) { + this.key = key; + this.item = item; + } + + /** + * key + */ + private String key; + /** + * item + */ + private String item; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json index ae9678e26c..bf1f5e0676 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json @@ -25,6 +25,7 @@ }, "FSetAccountType": "2", "FISTAXINCOST": false, + "FAP_Remark": "@KD_FAP_Remark", "FISHookMatch": false, "FPURCHASEDEPTID":{ "FNumber":"01" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java index a7e9fa832d..f7316c8d4d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java @@ -34,6 +34,7 @@ public class ApPayBillCastToKingDeeBillFields { //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index db6e0bc438..0f88a8d7b8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -24,9 +24,29 @@ public class ApPayBillService extends FinKingDeeService { try { //业务表的主表数据集合 Map map_fEntityModel_= object2Map(apPayBill);//createMapParams(stringObjectMap); + //应付类别 + String F_PAEZ_AssistantCode = map_fEntityModel_.get("F_PAEZ_AssistantType"); + String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey"); + String F_PAEZ_Assistant="";//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码 映射来源“CWXT”/“财务系统” + map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant); + //准备 物料列表的数据 ForEntryBill List fpaybillentrYs = apPayBill.getFPAYBILLENTRY(); List> vehicleListMap = createVehicleLists(fpaybillentrYs); + for(int i=0;i params=vehicleListMap.get(i); + //付款用途 + String FPURPOSEIDCode = params.get("FPURPOSEIDType"); + String FPURPOSEIDKey = params.get("FPURPOSEIDKey"); + //结算方式 + String FSETTLETYPEIDCode = params.get("FSETTLETYPEIDType"); + String FSETTLETYPEIDKey = params.get("FSETTLETYPEIDKey"); + + String FPURPOSEID="";//TODO 根据付款用途的code,key查询金蝶系统中的付款用途的编码 映射来源“CWXT”/“财务系统” + params.put("FPURPOSEID",FPURPOSEID); + String FSETTLETYPEID="";//TODO 根据结算方式的code,key查询金蝶系统中的结算方式的编码 映射来源“CWXT”/“财务系统” + params.put("FSETTLETYPEID",FSETTLETYPEID); + } String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); } catch (Exception e) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json index 9ffc692dd8..f428a0a6cb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json @@ -12,6 +12,6 @@ "FPAYAMOUNT_E": @KD_FPAYAMOUNT_E, "FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"}, "FPOSTDATE": "@KD_FPOSTDATE", - "FRuZhangType": "@KD_FRuZhangType", - "FPayType": "@KD_FPayType" + "FRuZhangType": "1", + "FPayType": "A" } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json index 1687f1c0bb..43ee1bca10 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json @@ -39,6 +39,7 @@ }, "FIsWriteOff": false, "FREALPAY": false, + "FREMARK": "@KD_FREMARK", "F_PAEZ_Assistant": { "FNumber": "001" }, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json index 309c33cd55..4867b140f4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json @@ -16,6 +16,7 @@ "FCustTypeId": { "FNumber": "KHLB001_SYS" }, + "FDescription": "@KD_FDescription", "FTRADINGCURRID": { "FNumber": "PRE001" }, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java index 4205cf790a..c1730443b6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java @@ -39,6 +39,7 @@ public class BdMaterialCastToKingDeeBillFields { JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); fEntityData_ =KingDeeUtils.replaceTemplateParams(fEntityData_, map_fEntityModel_); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index de5ddd26f8..6f6dd9a784 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -4,10 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; -import com.yxt.anrui.fin.api.kingdee.KingDeeResult; +import com.yxt.anrui.fin.api.kingdee.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.slf4j.Logger; @@ -25,42 +26,120 @@ import java.util.Map; public class BdMaterialService extends FinKingDeeService { private static Logger log= LoggerFactory.getLogger(BdMaterialService.class); /** - * 保存物料 list - * @param bdMaterial + * 批量暂存物料 list + * @param bdMaterials * @return */ - public ResultBean draftBdMaterialList(List bdMaterial) { + public ResultBean draftBdMaterialList(List bdMaterials) { + ResultBean rb=ResultBean.fireFail(); + // bdMaterial=BdMaterial.createBdMaterial(); + Map data = getStringObjectMap(bdMaterials); + List list_r=new ArrayList<>(); + for(BdMaterial b:bdMaterials) { + //物料信息转map参数 + Map stringObjectMap = BeanUtil.beanToMap(b); + //业务表的主表数据集合 + Map map_fEntityModel_ = createMapParams(stringObjectMap); + ResultBean stringResultBean = setMappingInfosParams(map_fEntityModel_, data,getKeyItems()); + if(!stringResultBean.getSuccess()){ + return stringResultBean; + } + map_fEntityModel_.put("IsDeleteEntry", "True"); + map_fEntityModel_.put("FMATERIALID", 0 + ""); + map_fEntityModel_.put("FMaterialGroup","02"); + map_fEntityModel_.put("F_PAEZ_Base","02"); + rb= draftBdMaterial(map_fEntityModel_); + if (rb.getSuccess()) { + list_r.add(rb.getData()); + } + } + return rb.success().setData(JSONObject.toJSONString(list_r)); + } + private Map getStringObjectMap(List bdMaterials) { + List> som=new ArrayList<>(); + bdMaterials.forEach(bdMaterial -> { + som.add(BeanUtil.beanToMap(bdMaterial)); + }); + // "存货类别 FCategoryID,物料分组 FMaterialGroup,车辆类型 F_PAEZ_Base 车辆系别 F_PAEZ_Base2 车辆马力 F_PAEZ_Base3 车辆驱动 F_PAEZ_Base4" + List params = getKeyItems(); + List>> list = makeMappingInfosParams(som,params,"FName", + "物料","CWXT"); + ResultBean> sysMappingInfoVoResultBeanBatch = getMappingInfosParams(list); + Map data = sysMappingInfoVoResultBeanBatch.getData(); + return data; + } + + private List getKeyItems() { + List params=new ArrayList<>(); + params.add(new KeyItem("FCategoryID","存货类别") ); + /* params.add(new KeyItem("FMaterialGroup","物料分组") ); + params.add(new KeyItem("F_PAEZ_Base","车辆类型") ); + params.add(new KeyItem("F_PAEZ_Base2","车辆系别") ); + params.add(new KeyItem("F_PAEZ_Base3","车辆马力") ); + params.add(new KeyItem("F_PAEZ_Base4","车辆驱动") );*/ + return params; + } + + /** + * 批量修改物料 list + * @param bdMaterials + * @return + */ + public ResultBean saveBdMaterialList(List bdMaterials) { // bdMaterial=BdMaterial.createBdMaterial(); - List list=new ArrayList<>(); ResultBean rb=ResultBean.fireFail(); - for(BdMaterial b:bdMaterial) { - rb= draftBdMaterial(b); + Map data = getStringObjectMap(bdMaterials); + List list_r=new ArrayList<>(); + for(BdMaterial b:bdMaterials) { + Map stringObjectMap = BeanUtil.beanToMap(b); + if(StringUtils.isBlank(b.getOldFName())){ + return rb.setMsg("FMATERIALID不能为空"); + } + ResultBean stringResultBean = null; + try { + stringResultBean = unAudit(b); + } catch (Exception e) { + e.printStackTrace(); + } + if(!stringResultBean.getSuccess()){ + return stringResultBean; + } + String FMATERIALID=stringResultBean.getData(); + Map map_fEntityModel_=createMapParams(stringObjectMap); + ResultBean stringResultBean1 = setMappingInfosParams(map_fEntityModel_, data,getKeyItems()); + if(!stringResultBean1.getSuccess()){ + return stringResultBean1; + } + map_fEntityModel_.put("IsDeleteEntry","False"); + map_fEntityModel_.put("FMATERIALID",FMATERIALID); + map_fEntityModel_.put("FMaterialGroup","02"); + map_fEntityModel_.put("F_PAEZ_Base","02"); + rb= saveBdMaterial(map_fEntityModel_); if (rb.getSuccess()) { - list.add(rb.getData()); + list_r.add(rb.getData()); } } - return rb.success(); + return rb.success().setData(JSONObject.toJSONString(list_r)); } + /** - * 暂存物料 - * @param bdMaterial + * 调用金蝶接口暂存物料 + * @param map_fEntityModel_ * @return */ - public ResultBean draftBdMaterial(BdMaterial bdMaterial) { + private ResultBean draftBdMaterial( Map map_fEntityModel_) { // bdMaterial=BdMaterial.createBdMaterial(); ResultBean rb=ResultBean.fireFail(); - //物料信息转map参数 - Map stringObjectMap = BeanUtil.beanToMap(bdMaterial); - //业务表的主表数据集合 - Map map_fEntityModel_=createMapParams(stringObjectMap); - map_fEntityModel_.put("IsDeleteEntry","True"); - map_fEntityModel_.put("FMATERIALID",0+""); String kingDeeData = BdMaterialCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); try { ResultBean draft = draft(kingDeeData); - if (!draft.getSuccess()) return rb.setMsg("物料保存失败!"); String data = draft.getData(); - submitAuditAllocate(bdMaterial, data); + ResultBean submit = submitAuditAllocate(data); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); + ResultBean audit = audit(data); + if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); + ResultBean allocate = allocate(map_fEntityModel_.get("TOrgIds"), data); + if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData()); return draft; } catch (Exception e) { e.printStackTrace(); @@ -70,30 +149,19 @@ public class BdMaterialService extends FinKingDeeService { /** * 修改物料的信息 - * @param bdMaterial * @return */ - public ResultBean saveBdMaterial(BdMaterial bdMaterial) { + private ResultBean saveBdMaterial( Map map_fEntityModel_) { // bdMaterial=BdMaterial.createBdMaterial(); ResultBean rb=ResultBean.fireFail(); //物料信息转map参数 - Map stringObjectMap = BeanUtil.beanToMap(bdMaterial); - if(StringUtils.isBlank(bdMaterial.getOldFName())){ - return rb.setMsg("FMATERIALID不能为空"); - } try{ - ResultBean stringResultBean = hasMaterial(bdMaterial); - if(!stringResultBean.getSuccess()){ - return stringResultBean; - } - String FMATERIALID=stringResultBean.getData(); - Map map_fEntityModel_=createMapParams(stringObjectMap); - map_fEntityModel_.put("IsDeleteEntry","False"); - map_fEntityModel_.put("FMATERIALID",FMATERIALID); ResultBean save = save(map_fEntityModel_); String data = save.getData(); - if (submit( data)) return rb.setMsg("物料提交失败!"); - if (audit( data)) return rb.setMsg("物料审核失败!"); + ResultBean submit = submitAuditAllocate( data); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setMsg(KingDeeCode.SUBMIT.getMsg()); + ResultBean audit = audit(data); + if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setMsg(KingDeeCode.AUDIT.getMsg()); return save; } catch (Exception e) { e.printStackTrace(); @@ -113,16 +181,16 @@ public class BdMaterialService extends FinKingDeeService { kingDeeData, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator, KingDeeBillUrl.DRAFT_URL.getURL()); if(!stringResultBean.getSuccess()){ log.info("物料保存失败!"); - return rb; + return rb.setMsg("物料保存失败!"); } - String data1 = stringResultBean.getData(); - JSONObject jsonObject = JSONObject.parseObject(data1); + String data = stringResultBean.getData(); + JSONObject jsonObject = JSONObject.parseObject(data); JSONObject result = (JSONObject)jsonObject.get("Result"); JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); boolean isSuccess = (boolean) responseStatus.get("IsSuccess"); if(!isSuccess){ - log.info("物料保存失败!"); - return rb; + log.info("物料编码重复!"); + return rb.setCode(KingDeeCode.REPEAT.getCode()); } log.info("物料保存成功!"); return stringResultBean; @@ -141,7 +209,7 @@ public class BdMaterialService extends FinKingDeeService { kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); if(!stringResultBean.getSuccess()){ log.info("物料保存失败!"); - return rb; + return rb.setMsg("物料保存失败!"); } String data1 = stringResultBean.getData(); JSONObject jsonObject = JSONObject.parseObject(data1); @@ -149,8 +217,8 @@ public class BdMaterialService extends FinKingDeeService { JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); boolean isSuccess = (boolean) responseStatus.get("IsSuccess"); if(!isSuccess){ - log.info("物料保存失败!"); - return rb; + log.info("物料编码重复!"); + return rb.setCode(KingDeeCode.REPEAT.getCode()).setMsg(KingDeeCode.REPEAT.getMsg()); } log.info("物料保存成功!"); return stringResultBean; @@ -162,32 +230,30 @@ public class BdMaterialService extends FinKingDeeService { * @return * @throws Exception */ - private ResultBean submitAuditAllocate(BdMaterial bdMaterial, String data) throws Exception { + private ResultBean submitAuditAllocate(String data) throws Exception { ResultBean rb=ResultBean.fireFail(); - if (submit( data)) return rb.setMsg("物料提交失败!"); - if (audit( data)) return rb.setMsg("物料审核失败!"); - if (allocate(bdMaterial, data)) return rb.setMsg("物料分配失败!"); + ResultBean submit = submit(data); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); return rb.success(); } /** * 分配 - * @param bdMaterial + * @param tOrgIds * @param data * @return * @throws Exception */ - private boolean allocate(BdMaterial bdMaterial, String data) throws Exception { - String allocate = getAllocate(data, bdMaterial.getTOrgIds(),KingDeeBillId.BD_MATERIAL.getID()); + private ResultBean allocate(String tOrgIds, String data) throws Exception { + String allocate = getAllocate(data,tOrgIds,KingDeeBillId.BD_MATERIAL.getID()); ResultBean resultBean3 =accessKingDeeInterface( KingDeeBillId.BD_MATERIAL.getID(), allocate, KingDeeBillUrl.ALLOCATE_URL.getURL());// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate); if(!resultBean3.getSuccess()){ log.info("物料分配失败!"); - return true; } log.info("物料分配成功!"); - return false; + return resultBean3; } /** @@ -196,16 +262,15 @@ public class BdMaterialService extends FinKingDeeService { * @return * @throws Exception */ - private boolean audit( String data) throws Exception { + private ResultBean audit( String data) throws Exception { String auditKD = getAuditKD(data,KingDeeBillId.BD_MATERIAL.getID()); ResultBean resultBean2 = accessKingDeeInterface( KingDeeBillId.BD_MATERIAL.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL());//auditKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), auditKD); if(!resultBean2.getSuccess()){ log.info("物料审核失败!"); - return true; } log.info("物料审核成功!"); - return false; + return resultBean2; } /** @@ -214,16 +279,15 @@ public class BdMaterialService extends FinKingDeeService { * @return * @throws Exception */ - private boolean submit( String data) throws Exception { + private ResultBean submit( String data) throws Exception { String submitKD = getSubmitKD(data,KingDeeBillId.BD_MATERIAL.getID()); ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(), submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), submitKD); if(!resultBean1.getSuccess()){ log.info("物料提交失败!"); - return true; } log.info("物料提交成功!"); - return false; + return resultBean1; } /** @@ -232,19 +296,19 @@ public class BdMaterialService extends FinKingDeeService { * @return * @throws Exception */ - public ResultBean hasMaterial(BdMaterial bdMaterial) throws Exception { + public ResultBean unAudit(BdMaterial bdMaterial) throws Exception { ResultBean rb=ResultBean.fireFail(); JSONObject result = view(bdMaterial); JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); if(responseStatus!=null){//不存在该物料 //新增物料 - return rb.setMsg("不存在该物料"); + return rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg()); }else{ //存在该物料 JSONObject result2 = (JSONObject)result.get("Result"); String DocumentStatus = (String)result2.get("DocumentStatus");//单据状态 A 创建， B 审核中,C 已审核 ,D 重新审核 String Id=result2.get("Id").toString(); boolean audit = isAudit(DocumentStatus, Id); if(!audit){ - return rb.setMsg("物料反审核失败!"); + return rb.setCode(KingDeeCode.UNAUDIT.getCode()).setMsg(KingDeeCode.UNAUDIT.getMsg()); } log.info("Id:{}",Id); return rb.success().setData(Id); @@ -288,5 +352,4 @@ public class BdMaterialService extends FinKingDeeService { } return true; } - } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json index ee991adec8..f89dc9386b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json @@ -1,5 +1,6 @@ { "FMATERIALID": @KD_FMATERIALID, + "FDescription": "@KD_FDescription", "FCreateOrgId": { "FNumber": "100" }, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json index 39f8117991..f2a07c5378 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json @@ -8,6 +8,7 @@ }, "FName": "@KD_FName", "FStockProperty": "1", + "FDescription": "@KD_FDescription", "FStockStatusType": "0,1,2,3,4,5,6,7,8", "FDefReceiveStatusId": { "FNumber": "KCZT02_SYS" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json index 58d4f7f2fc..1d9d292d69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/data_model.json @@ -19,5 +19,6 @@ "FService": false, "FMarketing": false, "FIsSynCERPOwer": false, - "FAcctOrgType": "1" + "FAcctOrgType": "1", + "FDescription": "@KD_FDescription" } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json index 08f145a22c..1243f50e78 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json @@ -22,6 +22,7 @@ "FSALEORGID": { "FNumber": "101" }, + "FAR_Remark": "@KD_FAR_Remark", "FISTAX": true, "FCancelStatus": "A", "FBUSINESSTYPE": "BZ", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java index e231f1e636..438129b5e2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java @@ -39,6 +39,12 @@ public class SalOutStockCastToKingDeeBillFields { //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + //项目类别 + String F_PAEZ_AssistantCode = map_fEntityModel_.get("F_PAEZ_AssistantCode"); + String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey"); + String F_PAEZ_Assistant="";//TODO 根据项目类别的code,key查询金蝶系统中的项目类别的编码 映射来源“CWXT”/“财务系统” + map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant); + fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index 1bf370fb69..7292f3960a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -31,5 +31,9 @@ "FPRICEBASEQTY": 1.0, "FOUTCONTROL": false, "FIsOverLegalOrg": false, - "FARNOTJOINQTY": 1.0 + "F_PAEZ_Decimal4": "@KD_F_PAEZ_Decimal4", + "F_PAEZ_Decimal3": "@KD_F_PAEZ_Decimal3", + "F_PAEZ_Decimal": "@KD_F_PAEZ_Decimal", + "FARNOTJOINQTY": 1.0, + "FEntrynote": "@KD_FEntrynote" } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json index 8d2231a761..fce15de160 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json @@ -27,6 +27,12 @@ }, "FOwnerTypeIdHead": "BD_OwnerOrg", "FIsTotalServiceOrCost": false, + "F_PAEZ_Base1": { + "FSTAFFNUMBER":"@KD_F_PAEZ_Base1" + }, + "F_PAEZ_Base": { + "FNUMBER": "@KD_F_PAEZ_Base" + }, "F_PAEZ_Assistant": { "FNumber": "@KD_F_PAEZ_Assistant" }, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index 7d5c658e29..5f031d267a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -96,10 +97,14 @@ public class STKInStockService extends FinKingDeeService { private void bdMaterial(StkInStock stkInStock, StkInStock.FInStockEntry f) { BdMaterial bdMaterial=new BdMaterial(); bdMaterial.setFName(f.getFMaterialId()); - bdMaterial.setF_PAEZ_Base(f.getCllx()); - bdMaterial.setFMaterialGroup(f.getWlfz()); + bdMaterial.setF_PAEZ_BaseKey(f.getCllx()); + bdMaterial.setF_PAEZ_BaseType(f.getCllx()); + bdMaterial.setFMaterialGroupKey(f.getWlfz()); + bdMaterial.setFMaterialGroupType(f.getWlfz()); bdMaterial.setTOrgIds(stkInStock.getTOrgId()); - bdMaterialService.draftBdMaterial(bdMaterial); + List list=new ArrayList<>(); + list.add(bdMaterial); + bdMaterialService.draftBdMaterialList(list); } /** diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json index 3c6e635dc0..b65e5c7d7a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json @@ -33,6 +33,7 @@ "FPriceUnitQty":1.0, "FRemainInStockQty":1.0, "FAPNotJoinQty": 1.0, - "FRemainInStockBaseQty": 1.0 + "FRemainInStockBaseQty": 1.0, + "FNote": "@KD_FNote" } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json index bce2dbc336..9ded37c3ba 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json @@ -5,7 +5,7 @@ }, "FBizType": "NORMAL", "FTransferDirect": "GENERAL", - "FTransferBizType": "调车", + "FTransferBizType": "组织内调拨", "FSettleOrgId": { "FNumber": "" }, @@ -32,6 +32,7 @@ "FNumber": "@KD_FStockOrgId" }, "FDate": "@KD_FDate", + "FNote": "@KD_FNote", "FBaseCurrId": { "FNumber": "PRE001" }, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java new file mode 100644 index 0000000000..a8b972062b --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/timer/TimerUtil.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.fin.biz.timer; + +import cn.hutool.core.date.DateUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Slf4j +@Component // 把此类托管给 Spring，不能省略 +public class TimerUtil { + // 添加定时任务 + /* @Scheduled(cron = "30 40 23 0 0 5") // cron表达式：每周一 23:40:30 执行 + public void doTask1(){ + log.info("我是定时任务doTask1~:{}",TimerUtil.class); + }*/ + // 添加定时任务 + @Scheduled(cron = "0/2 * * * * ?") // cron表达式：每隔两秒中执行一次 + public void doTask2(){ + log.info("我是定时任务doTask2~:{},{}",DateUtil.now(),TimerUtil.class); + } + // 添加定时任务 + @Scheduled(cron = "0 59 23 * * ?") // cron表达式：每天晚上23点59分执行一次 + public void doTask3(){ + log.info("我是定时任务doTask3~:{},{}",DateUtil.now(),TimerUtil.class); + } + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java index a49d26d9dd..d86e5fb113 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -34,6 +34,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * Project: sysmapping(sysmapping)
@@ -85,9 +86,11 @@ public interface SysMappingFeign { @PostMapping("/selectMappingInfo") @ResponseBody public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); - - @ApiOperation("回显映射") - @GetMapping("/selectMappingListInfo/{dictSid}") + @PostMapping("/selectMappingListInfo") + @ResponseBody + public ResultBean> selectMappingListInfo(String dictSid); + @ApiOperation("根据条件查询详情批量") + @PostMapping("/selectMappingInfoBatch") @ResponseBody - public ResultBean> selectMappingListInfo(@PathVariable("dictSid") String dictSid); + public ResultBean> selectMappingInfoBatch(@RequestBody List>> sysMappingInfoQuerys) ; } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java index 69b4ad0a12..e6cd81caf4 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: sysmapping(sysmapping)
@@ -84,4 +85,9 @@ public class SysMappingFeignFallback implements SysMappingFeign { public ResultBean> selectMappingListInfo(String dictSid) { return null; } + + @Override + public ResultBean> selectMappingInfoBatch(List>> sysMappingInfoQuerys) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java new file mode 100644 index 0000000000..6efbf2454f --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQueryBatch implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key + /* @ApiModelProperty("编码") + private String fNumber; // 编码*/ +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java index b71b59ae62..bfd1db12d3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java @@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * Project: sysmapping(sysmapping)
@@ -117,4 +118,11 @@ public class SysMappingRest implements SysMappingFeign { List vo = sysMappingService.selectMappingListInfo(dictSid); return rb.success().setData(vo); } + + @Override + public ResultBean> selectMappingInfoBatch( @RequestBody List>> sysMappingInfoQuerys) { + ResultBean> rb = ResultBean.fireFail(); + Map vos = sysMappingService.selectMappingInfoBatch(sysMappingInfoQuerys); + return rb.success().setData(vos); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java index a2735afab6..d5852aaf0c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -33,9 +33,13 @@ import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Project: sysmapping(sysmapping)
@@ -170,4 +174,25 @@ public class SysMappingService extends MybatisBaseService selectMappingListInfo(String dictSid) { return baseMapper.selectMappingListInfo(dictSid); } + + public Map selectMappingInfoBatch(List>> sysMappingInfoQuerys) { + Map mapDict=new HashMap<>(); + for(Map> s:sysMappingInfoQuerys){ + String FNumber=""; + List> l=new ArrayList<>(); + for(Map.Entry> entry : s.entrySet()){ + FNumber = entry.getKey(); + List mapValue = entry.getValue(); + System.out.println(FNumber+":"+mapValue); + for(SysMappingInfoQueryBatch ss:mapValue){ + SysMappingInfoQuery query=new SysMappingInfoQuery(); + BeanUtil.copyProperties(ss,query); + Map stringObjectMap = BeanUtil.beanToMap(selectMappingInfo(query)); + l.add(stringObjectMap); + } + } + mapDict.put(FNumber,l); + } + return mapDict; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 5c3ed76277..644609136e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -32,7 +32,6 @@ import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo; import com.yxt.anrui.scm.api.scmfile.ScmFileDto; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; -import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; @@ -50,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -583,10 +581,12 @@ public class ScmApplyInboundService extends MybatisBaseService baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(s.getVinNo(),scmApplyInbound.getUseOrgSid()); bm.setFName(baseVehicleResultBean.getData().getVinNo());//物料名称 - bm.setFMaterialGroup("03");//物料分组 + bm.setFMaterialGroupKey("03");//物料分组 + bm.setFMaterialGroupType("03");//物料分组 //bm.setFUseOrgId("100");//使用组织 bm.setTOrgIds("100020");//欧曼黑龙江 - bm.setF_PAEZ_Base("牵引");//车辆类型 + bm.setF_PAEZ_BaseKey("牵引");//车辆类型 + bm.setF_PAEZ_BaseType("牵引");//车辆类型 list.add(bm); } }catch (Exception e){