yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

zhanglei
ligaode 2 months ago
parent
b0f0922fb0
commit
346f1cd6ce
3 changed files with 54 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 81
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java
  2. 31
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java
  3. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

81
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java
View File

@ -33,94 +33,81 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApply.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApply <br/>
* Description: 车辆交回事前报备申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "车辆交回事前报备申请", description = "车辆交回事前报备申请") @ApiModel(value = "车辆交回事前报备申请", description = "车辆交回事前报备申请")
@TableName("loan_restore_report_apply") @TableName("loan_restore_report_apply")
public class LoanRestoreReportApply extends BaseEntity { public class LoanRestoreReportApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; // 创建人 private String createByName; // 创建人
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo; // 申请编号
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName; // 申请部门名称
@ApiModelProperty("销售订单车辆sid") @ApiModelProperty("销售订单车辆sid")
private String saleVehSid; private String saleVehSid;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("车牌号") @ApiModelProperty("车牌号")
private String carNum; // 车牌号 private String carNum; // 车牌号
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String custName; // 客户名称 private String custName; // 客户名称
@ApiModelProperty("贷款人") @ApiModelProperty("贷款人")
private String borrName; // 贷款人 private String borrName; // 贷款人
@ApiModelProperty("贷款合同编号") @ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号 private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方") @ApiModelProperty("资方")
private String bankName; // 资方 private String bankName; // 资方
@ApiModelProperty("资方合同编号") @ApiModelProperty("资方合同编号")
private String bankContractNo; // 资方合同编号 private String bankContractNo; // 资方合同编号
@ApiModelProperty("已还金额") @ApiModelProperty("已还金额")
private String alRepaidMoney; // 已还金额 private String alRepaidMoney; // 已还金额
@ApiModelProperty("当前逾期金额") @ApiModelProperty("当前逾期金额")
private String currentBeMoney; // 当前逾期金额 private String currentBeMoney; // 当前逾期金额
@ApiModelProperty("其中资金占用费") @ApiModelProperty("其中资金占用费")
private String wheFundOccMoney; // 其中资金占用费 private String wheFundOccMoney; // 其中资金占用费
@ApiModelProperty("未到期金额") @ApiModelProperty("未到期金额")
private String unexpiredMoney; // 未到期金额 private String unexpiredMoney; // 未到期金额
@ApiModelProperty("总期数") @ApiModelProperty("总期数")
private String nper; // 总期数 private String nper; // 总期数
@ApiModelProperty("当前期数") @ApiModelProperty("当前期数")
private String currentPeriod; // 当前期数 private String currentPeriod; // 当前期数
@ApiModelProperty("已还金额换算期数") @ApiModelProperty("已还金额换算期数")
private String alRepaidMoneyConPeriod; // 已还金额换算期数 private String alRepaidMoneyConPeriod; // 已还金额换算期数
@ApiModelProperty("逾期金额换算期数") @ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("交回方式key") @ApiModelProperty("交回方式key")
private String restoreTypeKey; // 交回方式key private String restoreTypeKey; // 交回方式key
@ApiModelProperty("交回方式value") @ApiModelProperty("交回方式value")
private String restoreTypeValue; // 交回方式value private String restoreTypeValue; // 交回方式value
@ApiModelProperty("预交回日期") @ApiModelProperty("预交回日期")
private String restoreDate; // 预交回日期 private String restoreDate; // 预交回日期
@ApiModelProperty("经办人sid") @ApiModelProperty("经办人sid")
private String operatorSid; // 经办人sid private String operatorSid; // 经办人sid
@ApiModelProperty("经办人姓名") @ApiModelProperty("经办人姓名")
private String operatorName; // 经办人姓名 private String operatorName; // 经办人姓名
@ApiModelProperty("涉及相关费用") @ApiModelProperty("涉及相关费用")
private String involveCorrMoney; // 涉及相关费用 private String involveCorrMoney; // 涉及相关费用
@ApiModelProperty("费用说明") @ApiModelProperty("费用说明")
private String costRemarks; // 费用说明 private String costRemarks; // 费用说明
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径 private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
} }

31
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java
View File

@ -25,43 +25,26 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.api.scmapplyinboundvehquery; package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
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; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
* File: ScmApplyInboundVehQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery <br/>
* Description: 车辆入库单车辆查询. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-28 15:55:31 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
public class ScmApplyInboundVehQueryMaterial { public class ScmApplyInboundVehQueryMaterial {
@ApiModelProperty("序号") @ApiModelProperty("序号")
private String id; // 序号 private String id; // 序号
@ApiModelProperty("物料编号") @ApiModelProperty("物料编号")
private String vinNo; // 物料编号 private String vinNo; // 物料编号
@ApiModelProperty("物料分组名称") @ApiModelProperty("物料分组名称")
private String mgroupName; // 物料分组名称 private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型value") @ApiModelProperty("车辆类型value")
private String vehicleType; // 车辆类型value private String vehicleType; // 车辆类型value
@ApiModelProperty("计量单位") @ApiModelProperty("计量单位")
private String iunit; // 计量单位 private String iunit; // 计量单位
@ApiModelProperty("数量") @ApiModelProperty("数量")
private String num; // 数量 private String num; // 数量
@ApiModelProperty("结算金额") @ApiModelProperty("结算金额")
private String settleMoney; // 结算金额 private String settleMoney; // 结算金额
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String localName; // 仓库名称 private String localName; // 仓库名称
} }

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
View File

@ -206,8 +206,16 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
id = id + 1; id = id + 1;
BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney()); BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney());
tPrice = tPrice.add(settleMoney); tPrice = tPrice.add(settleMoney);
//主车物料编码 if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 2).equals("SZ")) {
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8)); //上装物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 10));
} else if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 1).equals("G")) {
//挂车物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 9));
} else {
//主车物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
}
scmApplyInboundVehQueryMaterial.setId(String.valueOf(id)); scmApplyInboundVehQueryMaterial.setId(String.valueOf(id));
scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName()); scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName());
scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue()); scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
@ -246,12 +254,12 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
String downNum = scmApplyInboundQuery.getDownNum(); String downNum = scmApplyInboundQuery.getDownNum();
if (StringUtils.isBlank(downNum)){ if (StringUtils.isBlank(downNum)) {
downNum = "1"; downNum = "1";
}else { } else {
downNum = String.valueOf((Integer.parseInt(downNum) + 1)); downNum = String.valueOf((Integer.parseInt(downNum) + 1));
} }
baseMapper.updateDown(cgrkdSid,downNum); baseMapper.updateDown(cgrkdSid, downNum);
return rb.success().setData(pdfPath); return rb.success().setData(pdfPath);
} }

Write Preview
Loading…
Cancel
Save