Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
e102f45e0a
  1. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java
  3. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java
  4. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  5. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  6. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  7. 45
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java
  8. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
  9. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  10. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  11. 59
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherCastToKingDeeBillFields.java
  12. 98
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  13. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data.json
  14. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
  15. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json
  16. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json
  17. 81
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt
  18. 25
      anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue
  19. 4
      anrui-riskcenter-ui/src/views/loandatareview/loandatareviewAdd.vue
  20. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java
  21. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
  22. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  23. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java
  24. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java
  25. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java
  26. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  27. 15
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java

@ -1,5 +1,6 @@
package com.yxt.anrui.fin.api.finbillapplication;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -32,6 +33,9 @@ public class VinListVos {
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@ -26,6 +26,7 @@
package com.yxt.anrui.fin.api.finbillvehicle;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -80,5 +81,6 @@ public class FinBillVehicle extends BaseEntity {
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@ -87,6 +87,10 @@ public class FinBillVehicleDto implements Dto {
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -22,6 +22,7 @@ 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.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -67,6 +68,12 @@ public interface FinKingDeeFeign {
@ResponseBody
ResultBean<String> draftOtherReceivableBill(@RequestBody @Valid OtherReceivable otherReceivable);
@ApiOperation("保存凭证的接口")
@PostMapping("/saveVoucher")
@ResponseBody
ResultBean<String> saveVoucher(@RequestBody @Valid Voucher voucher);
@ApiOperation("暂存其他应收单的接口(资方信审终审通过后推送)")
@PostMapping("/pushOtherReceivableBill")
@ResponseBody

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -22,6 +22,7 @@ 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.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.common.core.result.ResultBean;
import java.util.List;
@ -43,6 +44,11 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
return null;
}
@Override
public ResultBean<String> pushOtherReceivableBill(CapitalCreditResult creditResult) {
return null;

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@ -4,6 +4,7 @@ public enum KingDeeBillId {
AP_PAYABLE("AP_Payable", "应付单"),
AR_RECEIVABLE("AR_receivable", "应收单"),
AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"),
GL_VOUCHER("GL_VOUCHER", "凭证"),
AP_PAYBILL("AP_PAYBILL", "付款单"),
SAL_RETURNSTOCK("SAL_RETURNSTOCK","销售退货单"),
AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),

45
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@ -0,0 +1,45 @@
package com.yxt.anrui.fin.api.kingdee.voucher;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.awt.print.Book;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/12 18:13
*/
@Data
public class Voucher {
@ApiModelProperty("账簿")
public String accountBook;
@ApiModelProperty("业务日期")
public String bussDate;
@ApiModelProperty("凭证字")
public String voucherWord;
@ApiModelProperty("凭证号")
public String voucherNo;
@ApiModelProperty("收款明细")
public List<Voucher.VoucherResultDetailDto> resultDetails;
@Data
public static class VoucherResultDetailDto implements Dto {
@ApiModelProperty("摘要")
public String remark;
@ApiModelProperty("科目编码")
public String subjectNo;
@ApiModelProperty("核算维度部门")
public String dimensionDept;
@ApiModelProperty("核算维度客户")
public String dimensionCustom;
@ApiModelProperty("借方金额")
public String debit;
@ApiModelProperty("贷方金额")
public String credit;
}
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@ -178,7 +178,8 @@
bv.`linkNo` AS vin,
bv.`linkSid` AS vinSid,
bc.`certificateState` AS certificateStateKey,
bc.`certificateStateValue` AS certificateState
bc.`certificateStateValue` AS certificateState,
lr.`capCarefulResult` AS xSState
FROM
anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo
@ -189,6 +190,8 @@
ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid`
LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
ON bv.`loanContractSid` = lr.`loanContractSid`
where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
</select>
</mapper>

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -4655,8 +4655,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
ResultBean<BillApplicationIInfoVoss> rb = ResultBean.fireFail();
BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
if("1".equals(busSalesOrder.getPayTypeKey())){
billApplicationIInfoVoss.setIsCanEdit(true);

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -26,6 +26,7 @@ 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.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
@ -48,6 +49,7 @@ 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.stktransferdirect.StkTransferDirectService;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -182,6 +184,13 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Autowired
private SalesReturnOrdersService salesReturnOrdersService;
/**
* 销售退货单
*/
@Autowired
private VoucherService voucherService;
@ApiOperation("入账暂存应付单的接口")
@PostMapping("/draftEntryBill")
@ResponseBody
@ -206,6 +215,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
return otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(voucher));
return voucherService.saveVoucher(voucher);
}
@Override
public ResultBean<String> pushOtherReceivableBill(CapitalCreditResult creditResult) {
log.info("FinKingDeeFeignRest-pushOtherReceivableBill:{}", JSONObject.toJSONString(creditResult));

59
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherCastToKingDeeBillFields.java

@ -0,0 +1,59 @@
package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 封装转换的类
*/
public class VoucherCastToKingDeeBillFields {
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
* @param map_fEntityModel_
* @param vehicleList
* @return
*/
public static String getKingDeeData(Map<String,String> map_fEntityModel_,List<Map<String,String>> vehicleList){
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json");
//模板字符创转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);
List<JSONObject> list_fEntity_=new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json");
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntity_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntity_.put(entry.getKey(),entry.getValue());
}
fEntity_ =KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntity_);
list_fEntity_.add(JSONObject.parseObject(fEntity_,Feature.OrderedField));
}
jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
}

98
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@ -0,0 +1,98 @@
package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class VoucherService extends FinKingDeeService {
/**
* 生成的凭证的数据推送到金蝶的平台中
*
* @param voucher
* @return
*/
public ResultBean saveVoucher(Voucher voucher) {
ResultBean rb = ResultBean.fireFail();
//业务表的主表数据集合
Map<String, String> map_fEntityModel_ = new HashMap<>();
//物料的数组集合
//账簿
if (StringUtils.isBlank(voucher.getAccountBook())) {
return rb.setMsg("账簿不能为空");
}
map_fEntityModel_.put("FAccountBookID", voucher.getAccountBook());
//业务日期
if (StringUtils.isBlank(voucher.getBussDate())) {
return rb.setMsg("业务日期不能为空");
}
map_fEntityModel_.put("FDate", voucher.getBussDate());
//凭证字
if (StringUtils.isBlank(voucher.getVoucherWord())) {
return rb.setMsg("凭证字不能为空");
}
map_fEntityModel_.put("FVOUCHERGROUPID", voucher.getVoucherWord());
//凭证号
if (StringUtils.isBlank(voucher.getVoucherNo())) {
return rb.setMsg("凭证号不能为空");
}
map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo());
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(voucherResultDetailDtos);
if (!vehicleListMap.getSuccess()) {
return rb.setMsg(vehicleListMap.getMsg());
}
String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
try {
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if (!resultBean1.getSuccess()) {
log.info("凭证保存失败!");
return rb.setMsg("凭证保存失败!");
}
log.info("凭证保存成功!");
// String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
// ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
// if (!resultBean2.getSuccess()) {
// log.info("凭证提交失败!");
// return rb.setMsg("凭证提交失败!");
// }
// log.info("凭证提交成功!");
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
}
public ResultBean<List<Map<String, String>>> createVehicleListsForReceivableBill(List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos) {
ResultBean<List<Map<String, String>>> rb = ResultBean.fireFail();
List<Map<String, String>> voucherDetailMap = new ArrayList<>();
for (int i = 0; i < voucherResultDetailDtos.size(); i++) {
Voucher.VoucherResultDetailDto c = voucherResultDetailDtos.get(i);
Map<String, String> m = new HashMap<>();
if (StringUtils.isBlank(c.getSubjectNo())) {
return rb.setMsg("科目编码不能为空");
}
m.put("FEXPLANATION", c.getRemark());
m.put("FACCOUNTID", c.getSubjectNo());
m.put("FFLEX5", c.getDimensionDept());
m.put("FFLEX6", c.getDimensionCustom());
m.put("FDEBIT", c.getDebit());
m.put("FCREDIT", c.getCredit());
voucherDetailMap.add(m);
}
return rb.success().setData(voucherDetailMap);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data.json

@ -0,0 +1,4 @@
{
"formId": "GL_VOUCHER",
"data": "@KD_data"
}

24
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@ -0,0 +1,24 @@
{
"FEXPLANATION": "@KD_FEXPLANATION",
"FACCOUNTID": {
"FNumber": "@KD_FACCOUNTID"
},
"FDetailID": {
"FDETAILID__FFLEX5": {
"FNumber": "@KD_FFLEX5"
},
"FDETAILID__FFLEX6": {
"FNumber": "@KD_FFLEX6"
}
},
"FCURRENCYID": {
"FNumber": "PRE001"
},
"FEXCHANGERATETYPE": {
"FNumber": "HLTX01_SYS"
},
"FEXCHANGERATE": 1,
"FAMOUNTFOR": "",
"FDEBIT": "@KD_FDEBIT",
"FCREDIT": "@KD_FCREDIT"
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json

@ -0,0 +1,13 @@
{
"Creator": "",
"NeedUpDateFields": [],
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"SubSystemId": "",
"IsVerifyBaseDataField": "false",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",
"InterationFlags": "",
"Model": {}
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json

@ -0,0 +1,13 @@
{
"FVOUCHERID": 0,
"FAccountBookID": {
"FNumber": "@KD_FAccountBookID"
},
"FDate": "@KD_FDate",
"FVOUCHERGROUPID": {
"FNumber": "@KD_FVOUCHERGROUPID"
},
"FVOUCHERGROUPNO": "@KD_FVOUCHERGROUPNO",
"FEntity": []
}

81
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt

@ -0,0 +1,81 @@
请求参数说明:
1.formid:业务对象表单Id,字符串类型(必录)
2.data:Json格式数据(详情参考Json格式数据)(必录)
2.1.Creator:创建者内码(非必录)
2.2.NeedUpDateFields:需要更新的字段,数组类型,格式:[key1,key2,...](非必录),注(更新单据体字段得加上单据体key)
2.3.NeedReturnFields:需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录),注(返回单据体字段格式:entitykey.key)
2.4.IsDeleteEntry:是否删除已存在的分录,布尔类型,默认true(非必录)
2.5.SubSystemId:表单所在的子系统内码,字符串类型(非必录)
2.6.IsVerifyBaseDataField:是否验证所有的基础资料有效性,布尔类,默认false(非必录)
2.7.IsEntryBatchFill:是否批量填充分录,默认true(非必录)
2.8.ValidateFlag:是否验证标志,布尔类型,默认true(非必录)
2.9.NumberSearch:是否用编码搜索基础资料,布尔类型,默认true(非必录)
2.10.InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录),例如(允许负库存标识:STK_InvCheckResult)
2.11.Model:表单数据包,Json类型(必录)
字段说明:
核算维度:FDetailID
币别:FCURRENCYID (必填项)
摘要:FEXPLANATION
科目编码:FACCOUNTID (必填项)
原币金额:FAMOUNTFOR
借方金额:FDEBIT
汇率类型:FEXCHANGERATETYPE (必填项)
汇率:FEXCHANGERATE
调整期间:FADJPRD
引入版本号:FIMPORTVERSION
合计: :FAmountDisplay
打印次数:FPRINTTIMES
转存信息-转入:FDepositIn
转存信息-转出:FDepositOut
当前年度:FCurrentYear
当前期间:FCurrentPeriod
单价:FPrice
单位:FUnitId
科目全名:FAcctFullName
数量:FQty
上移下移之前的分录内码:FOldEntryId
现金流量#分录ID:FEXPORTENTRYID
科目单位数量:FAcctUnitQty
计量单位数量:FBaseUnitQty
结算方式:FSettleTypeID
本位币金额:FAmount
贷方金额:FCREDIT
借贷方向:FDC
是否已指定现金流量:FCASHFLOWITEM
是否参与多栏账汇总:FISMULTICOLLECT
结算号:FSETTLENO
科目名称:FACCOUNTNAME
修改日期:FModifyDate
作废状态:FInvalid
用户组:FCreaterGroup
借方总金额:FDEBITTOTAL
贷方总金额:FCREDITTOTAL
出纳:FCASHIERID
审核日期:FAuditDate
审核:FCHECKERID
过账:FPOSTERID
日期:FDate (必填项)
外币:FISFOREIGNCUR
凭证编号:FBillNo
账簿:FAccountBookID (必填项)
会计年度:FYEAR
期间:FPERIOD
凭证字:FVOUCHERGROUPID (必填项)
附件数:FATTACHMENTS
核算组织:FACCBOOKORGID
已指定现金流量项目:FISCASHFLOW
业务类型:FSourceBillKey
本位币(辅助):FBASECURRENCYID
数量金额核算:FIsQty
修改人:FModifierId
是否拆分:FIsSplit
凭证号:FVOUCHERGROUPNO (必填项)
创建日期:FCreateDate
操作类型:FOperateType
审核状态:FDocumentStatus (必填项)
制单:FCreatorId
取消复核操(作辅助):FCancleRecheck
来源系统:FSystemID
是否调整期凭证:FISADJUSTVOUCHER
出纳复核操作(辅助):FCashierRecheck

25
anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue

@ -132,7 +132,7 @@
<el-col :span="24">
<div class="span-sty">公司要求材料</div>
<el-form-item>
<el-button style="margin-left: 130px !important;" type="primary" size="small">模板下载</el-button>
<el-button style="margin-left: 130px !important;" type="primary" size="small" @click="downLoad('/template/信息查询授权书.pdf')">模板下载</el-button>
</el-form-item>
</el-col>
</el-row>
@ -187,6 +187,7 @@
import req from '@/api/creditauditmanagement/creditauditmanagement'
import uploadImg from '@/components/uploadFile/uploadImg'
import { getOrgSidByPath, fetchBySid, selModelByUseOrgSid, selectCustomerList, typeValues, selectListByOrgPath } from '@/api/Common/dictcommons'
import {getStorage} from "@/utils/auth";
export default {
name: 'CreditAuditManagementAdd',
@ -421,6 +422,28 @@ export default {
this.dialogVisible = true
this.list = row
},
downLoad(filePath) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + filePath + '&outFileName=' + '信息查询授权书', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '信息查询授权书.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
},
//
handleConfirm() {
if (this.accessory.policyImages.length > 0) {

4
anrui-riskcenter-ui/src/views/loandatareview/loandatareviewAdd.vue

@ -99,7 +99,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">融资合同</div>
<div class="span-sty">融资合同(压缩包文件)</div>
<el-form-item>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<upload ref="upload" :accept="'.rar, application/zip, application/x-zip-compressed, application/x-rar-compressed'" v-model="image_list5" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
@ -261,7 +261,7 @@ export default {
type: 'warning'
}).then(() => {
this.formobj.zlState = '1'
this.getUrl()
this.saveOrUpdate()
}).catch(() => {
})
},

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@ -77,6 +77,7 @@ public class LoanHomevisitFileexamineQuery implements Query {
private String homeVisStaffName;
@ApiModelProperty("组织全路径")
private String orgSidPath;
private String orgPath;
private String menuUrl;
private String type;
private String names;

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@ -110,13 +110,13 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -91,4 +91,6 @@ public class BillApplicationIInfoVo implements Vo {
private Boolean showValueCustomer;
@ApiModelProperty("是否为单独新增")
private Boolean showBtn;
@ApiModelProperty("是否显示信审终审")
private Boolean showXsState = false;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -18,6 +19,7 @@ public class SelBillZcVo implements Vo {
@ApiModelProperty("合格证状态value")
private String certificateState;
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证图片")
private List<String> zcHgzImages;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java

@ -28,5 +28,6 @@ public class VinListDto implements Dto {
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@ -32,6 +32,7 @@ public class VinListVo implements Vo {
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -204,6 +204,7 @@ public class InvoicedService {
vo.setInvoiceStateKey("001");
vo.setInvoiceState("正常开票");
vo.setDate(DateUtil.formatDate(new Date()));
vo.setShowXsState(true);
return rb.success().setData(vo);
}
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
@ -252,7 +253,10 @@ public class InvoicedService {
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
if (StringUtils.isNotBlank(finBillVehicle.getXSState())){
vinListVo.setXSState(finBillVehicle.getXSState());
vo.setShowXsState(true);
}
vinListVos.add(vinListVo);
}
vo.setVinList(vinListVos);
@ -541,6 +545,7 @@ public class InvoicedService {
finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
finBillVehicleDto.setXSState(vinListDto.getXSState());
finBillVehicleDtos.add(finBillVehicleDto);
}
finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);

15
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@ -50,6 +50,7 @@ import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.AppFinOtherPolicyA
import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.CompleteOtherPolicyDto;
import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.OtherPolicyFlowableQuery;
import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.OtherPolicyTaskQuery;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
@ -93,11 +94,15 @@ public class CreditReviewService {
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private LoanFinPolicyFeign loanFinPolicyFeign;
@Autowired
private DocPdfComponent docPdfComponent;
public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
ResultBean rb = ResultBean.fireFail();
CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo();
if (StringUtils.isBlank(query.getSid())) {//新增初始化
String prefixTemplateUrl = docPdfComponent.getPrefixTemplateUrl();
creditReviewDetailsVo.setDownUrl(prefixTemplateUrl + "信息查询授权书.pdf");
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
creditReviewDetailsVo.setUserSid(query.getUserSid());
@ -118,7 +123,7 @@ public class CreditReviewService {
creditReviewDetailsVo.setLegalPersonName(busSalesOrder.getCustomerName());
creditReviewDetailsVo.setLegalPersonMobile(busSalesOrder.getMobile());
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(query.getSourceSid()).getData();
if (StringUtils.isBlank(solutionsDetailsVo.getPolicySid())){
if (StringUtils.isBlank(solutionsDetailsVo.getPolicySid())) {
return rb.setMsg("缺少金融方案产品政策信息");
}
LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
@ -127,11 +132,11 @@ public class CreditReviewService {
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelFeign.fetchByOrderSid(query.getSourceSid()).getData();
creditReviewDetailsVo.setModelSid(busSalesOrderModel.getModelSid());
creditReviewDetailsVo.setModel(busSalesOrderModel.getModelName());
}else if (query.getCreateSource() == 3){//销售订单新增发起
} else if (query.getCreateSource() == 3) {//销售订单新增发起
creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey());
creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue());
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(query.getSourceSid()).getData();
if (StringUtils.isBlank(solutionsDetailsVo.getPolicySid())){
if (StringUtils.isBlank(solutionsDetailsVo.getPolicySid())) {
return rb.setMsg("缺少金融方案产品政策信息");
}
LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
@ -319,7 +324,7 @@ public class CreditReviewService {
LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo;
if (query.getAddNew()) {
LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsByShSidAndState(query.getSid(), "待提交").getData();
if (loanCreditAppealApplyDetailsVo != null){
if (loanCreditAppealApplyDetailsVo != null) {
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData();
creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason());
List<LoanCreditAppealPeoDetailsVo> loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos();
@ -340,7 +345,7 @@ public class CreditReviewService {
creditReviewDetailsSsVo.setSid(loanCreditAppealApplyDetailsVo.getSid());
creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId());
creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId());
}else {
} else {
loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
creditReviewDetailsSsVo.setSid2(query.getSid());
creditReviewDetailsSsVo.setOrgPath(query.getOrgPath());

Loading…
Cancel
Save