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 17df9380c3..1cd1d8cf3a 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 @@ -105,19 +105,10 @@ public class APPayable { @Data public static class ScmApplyInboundVehicleDto implements Dto { - @ApiModelProperty("车辆信息sid") - private String sid; - - @ApiModelProperty("车辆入库单sid") - private String applySid; - - @ApiModelProperty("车型sid") - private String modelSid; - - @ApiModelProperty("车架号(VIN)") + @ApiModelProperty("物料编码") private String vinNo; - @ApiModelProperty("备注") + @ApiModelProperty("物料名称") private String remarks; } } 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 c17c64ad76..292101a4b5 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 @@ -91,6 +91,8 @@ public class ARReceivable { @ApiModelProperty("车辆台数") private String num; + @ApiModelProperty("客户ID") + private String fcustomerid; @ApiModelProperty("车辆列表") private List vehicleList; 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 fc0fed2da8..a1949e3179 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 @@ -89,11 +89,12 @@ public class FinKingDeeFeignService { } //业务日期 map_fEntityModel_.put("FDATE",aRReceivable.getApplicationDate()); + map_fEntityModel_.put("FCUSTOMERID",aRReceivable.getFcustomerid()==null?" JXYXB":aRReceivable.getFcustomerid()); //供应商:FSUPPLIERID (必填项) if(aRReceivable.getApplicationDate()==null){ return rb.setMsg("供应商 不能为空"); } - map_fEntityModel_.put("FSUPPLIERID","010001"); + // map_fEntityModel_.put("FSUPPLIERID","010001"); List vehicleList = aRReceivable.getVehicleList()==null?new ArrayList<>(): aRReceivable.getVehicleList(); for(int i=0;i list_fEntityPlan_=new ArrayList<>(); + list_fEntityPlan_.add( jsonFEntityPlan_); + jsonFEntityModel_.put("FEntityPlan", JSONArray.parseArray(JSON.toJSONString(list_fEntityPlan_))); jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField)); jsonObj.put("data",jsonFEntityData_.toJSONString()); return jsonObj.toJSONString(); } - /** - * 业务实体类按照模板进行装换 - * @param params - * @param readJsonFile - * @param fEntityDetail_ - * @param fEntityPlan_ - * @return - */ - /* public static String cloneKingDeeParams(Map params, String readJsonFile, String fEntityDetail_, String fEntityPlan_){ - readJsonFile = readJsonFile.replace("@KD_Creator", "zs"); - //单据类型:FBillTypeID (必填项) - readJsonFile = readJsonFile.replace("@KD_FBillTypeID", "YFD01_SYS"); - //业务日期:FDATE (必填项) - readJsonFile = readJsonFile.replace("@KD_FDATE", "2022-07-26"); - //单据状态:FDOCUMENTSTATUS (必填项) - readJsonFile = readJsonFile.replace("@KD_FDOCUMENTSTATUS", "Z"); - //供应商:FSUPPLIERID (必填项) - readJsonFile = readJsonFile.replace("@KD_FSUPPLIERID", "010001"); - //币别:FCURRENCYID (必填项) - readJsonFile = readJsonFile.replace("@KD_FCURRENCYID", "PRE001"); - //付款条件:FPayConditon - readJsonFile = readJsonFile.replace("@KD_FPayConditon", ""); - //业务类型:FBUSINESSTYPE (必填项) - readJsonFile = readJsonFile.replace("@KD_FBUSINESSTYPE", "CG"); - //结算组织:FSETTLEORGID (必填项) - readJsonFile = readJsonFile.replace("@KD_FSETTLEORGID", "101"); - //付款组织:FPAYORGID (必填项) - readJsonFile = readJsonFile.replace("@KD_FPAYORGID", "101"); - //采购部门:FPURCHASEDEPTID (必填项) - readJsonFile = readJsonFile.replace("@KD_FPURCHASEDEPTID", "01"); - //作废状态:FCancelStatus (必填项) - readJsonFile = readJsonFile.replace("@KD_FCancelStatus", "A"); - StringBuilder sb=new StringBuilder(); - for(int i=0;i<1;i++){ - String fEntityDetail=fEntityDetail_.toString(); - //物料编码:FMATERIALID - fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", " JX091054"); - //物料说明:FMaterialDesc - fEntityDetail = fEntityDetail.replace("@KD_FMaterialDesc", "X牵引6*4-550超"); - //计价单位:FPRICEUNITID - fEntityDetail = fEntityDetail.replace("@KD_FPRICEUNITID", " liang"); - //单价:FPrice - fEntityDetail = fEntityDetail.replace("@KD_FPrice@", "312500.0"); - //计价数量:FPriceQty - fEntityDetail = fEntityDetail.replace("@KD_FPriceQty", "2.0"); - //含税单价:FTaxPrice - fEntityDetail = fEntityDetail.replace("@KD_FTaxPrice@", "350000.0"); - //含税净价:FPriceWithTax - fEntityDetail = fEntityDetail.replace("@KD_FPriceWithTax", "346500.0"); - //税率(%):FEntryTaxRate - fEntityDetail = fEntityDetail.replace("@KD_FEntryTaxRate", "12.0"); - //运输编号:F_PMZC_Assistant - fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Assistant", "1904110789"); - //物流车辆:F_PMZC_Base - fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base", "0001F"); - //物流项目:F_PMZC_Base1 - fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "01.001"); - //折扣率(%):FEntryDiscountRate - fEntityDetail = fEntityDetail.replace("@KD_FEntryDiscountRate", "1.0"); - //折扣额:FDISCOUNTAMOUNTFOR - fEntityDetail = fEntityDetail.replace("@KD_FDISCOUNTAMOUNTFOR", "7000.0"); - //不含税金额:FNoTaxAmountFor_D - fEntityDetail = fEntityDetail.replace("@KD_FNoTaxAmountFor_D", "618750.0"); - //税额:FTAXAMOUNTFOR_D - fEntityDetail = fEntityDetail.replace("@KD_FTAXAMOUNTFOR_D", "74250.0"); - //价税合计:FALLAMOUNTFOR_D - fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "693000.0"); - //库存单位:FStockUnitId - fEntityDetail = fEntityDetail.replace("@KD_FStockUnitId", "liang"); - //库存数量:FStockQty - fEntityDetail = fEntityDetail.replace("@KD_FStockQty", "2.0"); - //库存基本数量:FStockBaseQty - fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "2.0"); - //计价基本分母:FPriceBaseDen - fEntityDetail = fEntityDetail.replace("@KD_FPriceBaseDen", "1.0"); - //库存基本分子:FStockBaseNum - fEntityDetail = fEntityDetail.replace("@KD_FStockBaseNum", "1.0"); - //含税单价:FTaxPrice - fEntityDetail = fEntityDetail.replace("@KD_FTaxPrice@", "350000.0"); - //税率(%):FEntryTaxRate - fEntityDetail = fEntityDetail.replace("@KD_FEntryTaxRate", "12.0"); - //价税合计:FALLAMOUNTFOR_D - fEntityDetail = fEntityDetail.replace("@KD_FALLAMOUNTFOR_D", "693000.0"); - //库存基本数量:FStockBaseQty - fEntityDetail = fEntityDetail.replace("@KD_FStockBaseQty", "2.0"); - sb.append(fEntityDetail).append(","); - } - String sbs=sb.substring(0,sb.length()-1); - readJsonFile=readJsonFile.replace("@KD_FEntityDetail",sbs); - StringBuilder sb_fEntityPlan=new StringBuilder(); - for(int i=0;i<1;i++){ - String fEntityPlan=fEntityPlan_.toString(); - //应付金额:FPAYAMOUNTFOR - fEntityPlan = fEntityPlan.replace("@KD_FPAYAMOUNTFOR", "693000.00"); - //应付比例(%):FPAYRATE - fEntityPlan = fEntityPlan.replace("@KD_FPAYRATE", "100.00000"); - //表头计划 - 到期日:FENDDATE - fEntityPlan = fEntityPlan.replace("@KD_FENDDATE", "2022-07-22 00:00:00"); - sb_fEntityPlan.append(fEntityPlan).append(","); - } - String sb_fEntityPlans=sb_fEntityPlan.substring(0,sb_fEntityPlan.length()-1); - readJsonFile=readJsonFile.replace("@KD_FEntityPlan",sb_fEntityPlans); - return readJsonFile; - }*/ - } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json index 21f439d018..568513ade2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityDetail.json @@ -4,16 +4,27 @@ }, "FMaterialDesc": "@KD_FMaterialDesc", "FPRICEUNITID": { - "FNumber": "" + "FNumber": "@KD_FPRICEUNITID" }, + "FPriceQty": 1.0, + "FTaxPrice": 12222.0, + "FPrice": 12100.99, + "FEntryTaxRate": 1.0, + "FNoTaxAmountFor_D": 12100.99, + "FTAXAMOUNTFOR_D": 121.01, + "FALLAMOUNTFOR_D": 12222.0, "FDeliveryControl": false, "FStockUnitId": { - "FNumber": "" + "FNumber": "@KD_FPRICEUNITID" }, + "FStockQty": 1.0, "FIsFree": false, + "FStockBaseQty": 1.0, "FSalUnitId": { - "FNumber": "" + "FNumber": "@KD_FPRICEUNITID" }, + "FSalQty": 1.0, + "FSalBaseQty": 1.0, "FPriceBaseDen": 1.0, "FSalBaseNum": 1.0, "FStockBaseNum": 1.0 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityPlan.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityPlan.json new file mode 100644 index 0000000000..be2c097528 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_FEntityPlan.json @@ -0,0 +1,5 @@ +{ + "FENDDATE": "2022-08-02 00:00:00", + "FPAYRATE": 100.0, + "FPAYAMOUNTFOR": 12222.0 +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json index 7a6de6a2d8..08f145a22c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/receivablebilldata_model.json @@ -5,9 +5,9 @@ }, "FDATE": "@KD_FDATE", "FISINIT": false, - "FENDDATE_H": "", - "FCUSTOMERID":{ - "FNumber":"@KD_FCUSTOMERID" + "FENDDATE_H": "@KD_FDATE", + "FCUSTOMERID": { + "FNumber": "@KD_FCUSTOMERID" }, "FCURRENCYID": { "FNumber": "PRE001" @@ -29,7 +29,7 @@ "FISHookMatch": false, "FISINVOICEARLIER": false, "F_PMZC_Assistant2": { - "FNumber": "" + "FNumber": "01" }, "FsubHeadSuppiler": { "FORDERID": { @@ -43,14 +43,17 @@ } }, "FsubHeadFinc": { - "FACCNTTIMEJUDGETIME": "", + "FACCNTTIMEJUDGETIME": "@KD_FDATE", "FMAINBOOKSTDCURRID": { "FNumber": "PRE001" }, "FEXCHANGETYPE": { "FNumber": "HLTX01_SYS" }, - "FExchangeRate": 0 + "FExchangeRate": 1.0, + "FTaxAmountFor": 121.01, + "FNoTaxAmountFor": 12100.99 }, - "FEntityDetail": [] + "FEntityDetail": [], + "FEntityPlan": [] } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/testParams2.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/testParams2.txt new file mode 100644 index 0000000000..cc5171afc4 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/testParams2.txt @@ -0,0 +1,2 @@ +{"formId":"AR_receivable","data":"{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FID\":0,\"FBillTypeID\":{\"FNUMBER\":\"YSD01_SYS\"},\"FDATE\":\"2022-08-02 05:26:28\",\"FENDDATE\":\"2022-08-02 05:26:28\",\"FISINIT\":false,\"FENDDATE_H\":\"2022-08-02 05:26:28\",\"FCUSTOMERID\":{\"FNumber\":\" JXYXB\"},\"FCURRENCYID\":{\"FNumber\":\"PRE001\"},\"FISPRICEEXCLUDETAX\":true,\"FSETTLEORGID\":{\"FNumber\":\"101\"},\"FPAYORGID\":{\"FNumber\":\"101\"},\"FSALEORGID\":{\"FNumber\":\"101\"},\"FISTAX\":true,\"FCancelStatus\":\"A\",\"FBUSINESSTYPE\":\"BZ\",\"FSetAccountType\":\"1\",\"FISHookMatch\":false,\"FISINVOICEARLIER\":false,\"F_PMZC_Assistant2\":{\"FNumber\":\" \"},\"FsubHeadSuppiler\":{\"FORDERID\":{\"FNumber\":\" JXYXB\"},\"FTRANSFERID\":{\"FNumber\":\" JXYXB\"},\"FChargeId\":{\"FNumber\":\" JXYXB\"}},\"FsubHeadFinc\":{\"FACCNTTIMEJUDGETIME\":\"2022-08-02 00:00:00\",\"FMAINBOOKSTDCURRID\":{\"FNumber\":\"PRE001\"},\"FEXCHANGETYPE\":{\"FNumber\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0}, \"FEntityDetail\":[{\"FMaterialDesc\":\"X牵引6*4-550超\",\"FIsFree\":false,\"FSalUnitId\":{\"FNumber\":\"\"},\"FSalBaseNum\":1.0,\"FStockUnitId\":{\"FNumber\":\"\"},\"FMATERIALID\":{\"FNumber\":\" JX091054\"},\"FPRICEUNITID\":{\"FNumber\":\"\"},\"FDeliveryControl\":false,\"FPriceBaseDen\":1.0,\"FStockBaseNum\":1.0},{\"FMaterialDesc\":\"X牵引6*4-550超\",\"FIsFree\":false,\"FSalUnitId\":{\"FNumber\":\"\"},\"FSalBaseNum\":1.0,\"FStockUnitId\":{\"FNumber\":\"\"},\"FMATERIALID\":{\"FNumber\":\" JX091054\"},\"FPRICEUNITID\":{\"FNumber\":\"\"},\"FDeliveryControl\":false,\"FPriceBaseDen\":1.0,\"FStockBaseNum\":1.0}]}}"} +{"formId":"AR_receivable","data":"{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FID\":0,\"FBillTypeID\":{\"FNUMBER\":\"YSD01_SYS\"},\"FDATE\":\"2022-08-02 00:00:00\",\"FENDDATE\":\"2022-08-02 05:26:28\",\"FISINIT\":false,\"FENDDATE_H\":\"2022-08-02 00:00:00\",\"FCUSTOMERID\":{\"FNumber\":\" JXYXB\"},\"FCURRENCYID\":{\"FNumber\":\"PRE001\"},\"FISPRICEEXCLUDETAX\":true,\"FSETTLEORGID\":{\"FNumber\":\"101\"},\"FPAYORGID\":{\"FNumber\":\"101\"},\"FSALEORGID\":{\"FNumber\":\"101\"},\"FISTAX\":true,\"FCancelStatus\":\"A\",\"FBUSINESSTYPE\":\"BZ\",\"FSetAccountType\":\"1\",\"FISHookMatch\":false,\"FISINVOICEARLIER\":false,\"F_PMZC_Assistant2\":{\"FNumber\":\"01\"},\"FsubHeadSuppiler\":{\"FORDERID\":{\"FNumber\":\" JXYXB\"},\"FTRANSFERID\":{\"FNumber\":\" JXYXB\"},\"FChargeId\":{\"FNumber\":\" JXYXB\"}},\"FsubHeadFinc\":{\"FACCNTTIMEJUDGETIME\":\"2022-08-02 00:00:00\",\"FMAINBOOKSTDCURRID\":{\"FNumber\":\"PRE001\"},\"FEXCHANGETYPE\":{\"FNumber\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0,\"FTaxAmountFor\":121.01,\"FNoTaxAmountFor\":12100.99},\"FEntityDetail\":[{\"FMATERIALID\":{\"FNumber\":\" JX091054\"},\"FMaterialDesc\":\"X牵引6*4-550超\",\"FPRICEUNITID\":{\"FNumber\":\"liang\"},\"FPriceQty\":1.0,\"FTaxPrice\":12222.0,\"FPrice\":12100.99,\"FEntryTaxRate\":1.0,\"FNoTaxAmountFor_D\":12100.99,\"FTAXAMOUNTFOR_D\":121.01,\"FALLAMOUNTFOR_D\":12222.0,\"FDeliveryControl\":false,\"FStockUnitId\":{\"FNumber\":\"liang\"},\"FStockQty\":1.0,\"FIsFree\":false,\"FStockBaseQty\":1.0,\"FSalUnitId\":{\"FNumber\":\"liang\"},\"FSalQty\":1.0,\"FSalBaseQty\":1.0,\"FPriceBaseDen\":1.0,\"FSalBaseNum\":1.0,\"FStockBaseNum\":1.0}],\"FEntityPlan\":[{\"FENDDATE\":\"2022-08-02 00:00:00\",\"FPAYRATE\":100.0,\"FPAYAMOUNTFOR\":12222.0}]}}"} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/应收单的参数必填备注.xlsx b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/应收单的参数必填备注.xlsx index b267de5d3a..afa999de3d 100644 Binary files a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/应收单的参数必填备注.xlsx and b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/应收单的参数必填备注.xlsx differ