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 2dfe70c4df..7e12f39271 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 @@ -23,6 +23,7 @@ import com.yxt.anrui.fin.api.kingdee.push.SalOutStockPushSalReturnStock; import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -365,4 +366,9 @@ public interface FinKingDeeFeign { // ResultBean draftSalesReturnOrders(@RequestBody @Valid SalesReturn salesReturn); ResultBean draftSalesReturnOrders(@RequestBody @Valid SalOutStockPushSalReturnStock salReturnStock) throws Exception; + @ApiOperation("其它入库单保存接口") + @PostMapping("/draftStkMiscellaneous") + @ResponseBody + ResultBean draftStkMiscellaneous(@RequestBody @Valid StkMiscellaneous stkMiscellaneous); + } 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 65371bce1a..ce90810c5a 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 @@ -23,6 +23,7 @@ import com.yxt.anrui.fin.api.kingdee.push.SalOutStockPushSalReturnStock; import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -334,5 +335,10 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean draftStkMiscellaneous(StkMiscellaneous stkMiscellaneous){ + return null; + } + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmiscellaneous/StkMiscellaneous.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmiscellaneous/StkMiscellaneous.java index 381c2fa837..d5f5c800a0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmiscellaneous/StkMiscellaneous.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmiscellaneous/StkMiscellaneous.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.kingdee.stkmiscellaneous; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,24 +15,25 @@ import java.util.List; @Data public class StkMiscellaneous { - @ApiModelProperty("编号") - private String FBillNo; @ApiModelProperty("库存组织") + @JsonProperty("FStockOrgId") private String FStockOrgId; @ApiModelProperty("部门") + @JsonProperty("FDEPTID") private String FDEPTID; @ApiModelProperty("日期") private String FDate; @ApiModelProperty("货主") + @JsonProperty("FOwnerIdHead") private String FOwnerIdHead; @ApiModelProperty("备注") private String FNOTE; - public List StkMiscellaneousEntry = new ArrayList<>(); + public List StkMiscellaneousEntry = new ArrayList<>(); @Data - public class StkMiscellaneousEntry { + public static class StkMiscellaneousEntry { //物料编码 private String FMATERIALID; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 05de48e610..21f83ae4e0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -28,6 +28,7 @@ import com.yxt.anrui.fin.api.kingdee.push.SalOutStockPushSalReturnStock; import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.*; import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService; @@ -54,6 +55,7 @@ import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService; import com.yxt.anrui.fin.biz.kingdee.salesreturn.SalesReturnOrdersService; import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService; import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService; +import com.yxt.anrui.fin.biz.kingdee.stkmiscellaneous.StkMiscellaneousService; import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService; import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; @@ -216,6 +218,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Autowired private SysMappingFeign sysMappingFeign; + @Autowired + private StkMiscellaneousService stkMiscellaneousService; + @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @ResponseBody @@ -2008,6 +2013,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { return pushReturnService.getReturnStock(salReturnStock); } + @Override + public ResultBean draftStkMiscellaneous(StkMiscellaneous stkMiscellaneous) { + log.info("FinKingDeeFeignRest-draftStkMiscellaneous:{}", JSONObject.toJSONString(stkMiscellaneous)); + return stkMiscellaneousService.draftStkMiscellaneous(stkMiscellaneous); + } + @ApiOperation("暂存收款单的接口") @PostMapping("/draftArReceivebill") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/StkMiscellaneousService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/StkMiscellaneousService.java index f45570dae5..2027c65d94 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/StkMiscellaneousService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/StkMiscellaneousService.java @@ -37,13 +37,16 @@ public class StkMiscellaneousService extends FinKingDeeService { map_fEntityModel_.put("FDate", sdf.format(new Date())); } map_fEntityModel_.put("FBaseCurrId", "PRE001"); + map_fEntityModel_.put("FOwnerIdHead",stkMiscellaneous.getFOwnerIdHead()); + map_fEntityModel_.put("FDEPTID",stkMiscellaneous.getFDEPTID()); + map_fEntityModel_.put("FNOTE",stkMiscellaneous.getFNOTE()); List stkMiscellaneousEntryList = stkMiscellaneous.getStkMiscellaneousEntry() == null ? new ArrayList<>() : stkMiscellaneous.getStkMiscellaneousEntry(); //准备 物料列表的数据 ResultBean>> vehicleListMap = createVehicleListsForReceivableBill(stkMiscellaneousEntryList); if (!vehicleListMap.getSuccess()) { return rb.setMsg(vehicleListMap.getMsg()); } - String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData()); + String kingDeeData = StkMiscellaneousCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData()); try { ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.STK_MISCELLANEOUS.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); if (!resultBean1.getSuccess()) { @@ -72,6 +75,7 @@ public class StkMiscellaneousService extends FinKingDeeService { m.put("FUnitID", c.getFUnitID()); m.put("FSTOCKID", c.getFSTOCKID()); m.put("FOWNERID", c.getFOWNERID()); + m.put("FKEEPERID", c.getFOWNERID()); mapList.add(m); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_FEntity.json index 99a937a4b8..41e3b1c161 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_FEntity.json @@ -6,9 +6,10 @@ "FUnitID": { "FNumber": "@KD_FUnitID" }, - "FQty": { - "FNumber": "@KD_FQty" - }, + "FQty": 1.0, + "FREALQTY": 1.0, + "FBASEQTY": 1.0, + "FBaseUnitID": { "FNumber": "liang" }, "FSTOCKID": { "FNumber": "@KD_FSTOCKID" }, @@ -18,5 +19,7 @@ "FOWNERTYPEID": "BD_OwnerOrg", "FOWNERID": { "FNumber": "@KD_FOWNERID" - } + }, + "FKEEPERTYPEID": "BD_KeeperOrg", + "FKEEPERID": {"FNumber": "@KD_FKEEPERID"} } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_model.json index 84aa56d116..1d6bee1e3b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmiscellaneous/data_model.json @@ -1,5 +1,4 @@ { - "FBillNo": "@KD_FBillNo", "FBillTypeID": { "FNUMBER": "QTRKD01_SYS" }, @@ -15,6 +14,9 @@ "FBaseCurrId": { "FNumber": "PRE001" }, + "FDEPTID": { + "FNumber": "@KD_FDEPTID" + }, "FNOTE": "@KD_FNOTE", "FEntity": [ ] diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java index 19ba676db0..0e927572da 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java @@ -45,7 +45,7 @@ public class StkMisDeliveryService extends FinKingDeeService { if (!vehicleListMap.getSuccess()) { return rb.setMsg(vehicleListMap.getMsg()); } - String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData()); + String kingDeeData = StkMisDeliveryCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData()); try { ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.STK_MISCELLANEOUS.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); if (!resultBean1.getSuccess()) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java index f2d0abcb77..e3c81ac96f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java @@ -114,4 +114,15 @@ public class LoanReturnInboundApplyRest implements LoanReturnInboundApplyFeign { return ResultBean.fireSuccess(); } + + @ApiOperation(value = "财务推送其它入库单测试") + @PostMapping(value = "/pushStkIn") + public ResultBean pushStkIn(String sid){ + LoanReturnInboundApply loanReturnInboundApply = loanReturnInboundApplyService.fetchBySid(sid); + loanReturnInboundApplyService.pushStkIn(loanReturnInboundApply); + return ResultBean.fireSuccess(); + + } + + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java index d2be606dc6..338fbc6f35 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java @@ -20,6 +20,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; +import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; import com.yxt.anrui.fin.api.kingdee.voucher.Voucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -610,6 +611,11 @@ public class LoanReturnInboundApplyService extends MybatisBaseService { + //推送其他入库单 + //TOdO: + pushStkIn(finalLoanReturnInboundApply); + }); } catch (Exception e) { e.printStackTrace(); } @@ -698,17 +704,15 @@ public class LoanReturnInboundApplyService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); //借方 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); @@ -718,7 +722,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService stkMiscellaneousEntryList = new ArrayList<>(); + SysOrganizationVo sysOrgDept = sysOrganizationFeign.fetchBySid(loanReturnInboundApply.getCreateDeptSid()).getData(); + stkMiscellaneous.setFStockOrgId(sysOrg.getOrgCode()); + stkMiscellaneous.setFDEPTID(sysOrgDept.getOrgCode()); + stkMiscellaneous.setFNOTE(""); + stkMiscellaneous.setFDate(DateUtil.today()); + stkMiscellaneous.setFOwnerIdHead(sysOrg.getOrgCode()); + StkMiscellaneous.StkMiscellaneousEntry stkMiscellaneousEntry = new StkMiscellaneous.StkMiscellaneousEntry(); + stkMiscellaneousEntry.setFMATERIALID(loanReturnInboundApply.getVinNo()); + stkMiscellaneousEntry.setFUnitID("liang"); + stkMiscellaneousEntry.setFSTOCKID("ARZSCK"); + stkMiscellaneousEntry.setFOWNERID(sysOrg.getOrgCode()); + stkMiscellaneousEntryList.add(stkMiscellaneousEntry); + stkMiscellaneous.setStkMiscellaneousEntry(stkMiscellaneousEntryList); + ResultBean resultBean = finKingDeeFeign.draftStkMiscellaneous(stkMiscellaneous); + + } + private int submitBusinessData(SubmitReturnInbondApplyDto dto, LoanReturnInboundApply loanReturnInboundApply) { int r = 0; if (StringUtils.isBlank(dto.getSid())) {