From 26aae72ad542aba6c336fd6cd59e3ee5d297b951 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Mon, 16 Dec 2024 16:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A8=E9=80=81=E4=BB=98=E6=AC=BE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kingdee/appaybill/ApPayBillService.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 83441c09f4..de4c3b8631 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 @@ -1,21 +1,16 @@ package com.yxt.anrui.fin.biz.kingdee.appaybill; -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.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; -import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.common.core.result.ResultBean; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,11 +41,17 @@ public class ApPayBillService extends FinKingDeeService { for(int i=0;i params=vehicleListMap.get(i); //付款用途 - sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "付款用途", params.get("FPURPOSEIDKey"), params.get("FPURPOSEIDType")); - if(! sysMappingInfoVoResultBean.getSuccess()){ - return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); +// sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "付款用途", params.get("FPURPOSEIDKey"), params.get("FPURPOSEIDType")); +// if(! sysMappingInfoVoResultBean.getSuccess()){ +// return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); +// } +// params.put("FPURPOSEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"SFKYT08_SYS"); + String map_itemKey = sysMappingInfoVoResultBean.getData().getMap_itemKey(); + if (map_itemKey.equals("005")) { //根据付款类别来判断付款用途，005定金 对应预付款，其余为采购付款 + params.put("FPURPOSEID","SFKYT09_SYS");//预付款 + } else { + params.put("FPURPOSEID","SFKYT08_SYS");//采购付款 } - params.put("FPURPOSEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"SFKYT08_SYS"); //结算方式 sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "结算方式", params.get("FSETTLETYPEIDKey"), params.get("FSETTLETYPEIDType")); if(!sysMappingInfoVoResultBean.getSuccess()){