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

出纳付款金额修改为小数

master
dimengzhe 1 year ago
parent
fc4eec0125
commit
864e78a426
11 changed files with 40 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  4. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
  5. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
  6. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
  7. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
  8. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  9. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  10. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java
  11. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -777,11 +777,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
int price = booad.getPurchasePrice().intValue();
Integer num = booad.getNum();
finPaymentrecordDto.setCost(price * num - booad.getDeposit().intValue());
finPaymentrecordDto.setAccountsReceive(price * num - booad.getDeposit().intValue());
finPaymentrecordDto.setCost(String.valueOf(price * num - booad.getDeposit().intValue()));
finPaymentrecordDto.setAccountsReceive(String.valueOf(price * num - booad.getDeposit().intValue()));
} else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
finPaymentrecordDto.setCost(booad.getDeposit().intValue());
finPaymentrecordDto.setAccountsReceive(booad.getDeposit().intValue());
finPaymentrecordDto.setCost(String.valueOf(booad.getDeposit().intValue()));
finPaymentrecordDto.setAccountsReceive(String.valueOf(booad.getDeposit().intValue()));
}
//供应商编码
String purchasingUnitSid = booad.getPurchasingUnitSid();

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -633,8 +633,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
finPaymentrecordDto.setPayType(1);
finPaymentrecordDto.setCreateOrgSid(baseVehicleActualSales.getUseOrgSid());
finPaymentrecordDto.setUseOrgSid(baseVehicleActualSales.getUseOrgSid());
finPaymentrecordDto.setCost(Integer.valueOf(v.getPayAccount()));
finPaymentrecordDto.setAccountsReceive(Integer.valueOf(v.getPayAccount()));
finPaymentrecordDto.setCost(v.getPayAccount());
finPaymentrecordDto.setAccountsReceive(v.getPayAccount());
finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());
finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -692,8 +692,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
finPaymentrecordDto.setPayType(1);
finPaymentrecordDto.setCreateOrgSid(busVehicleApply.getCreateOrgSid());
finPaymentrecordDto.setUseOrgSid(busVehicleApply.getCreateOrgSid());
finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
finPaymentrecordDto.setAccountsReceive(busVehicleApply.getCurrentAmount().intValue());
finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().toString());
finPaymentrecordDto.setAccountsReceive(busVehicleApply.getCurrentAmount().toString());
finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode());

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
View File

@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -95,10 +96,14 @@ public class FinPaymentrecord extends BaseEntity {
private String receiveBank;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "实收金额")
/*@ApiModelProperty(value = "实收金额")
private Integer cost;
@ApiModelProperty(value = "应收金额")
private Integer accountsReceive;
private Integer accountsReceive;*/
@ApiModelProperty(value = "实收金额")
private BigDecimal cost;
@ApiModelProperty(value = "应收金额")
private BigDecimal accountsReceive;
@ApiModelProperty(value = "业务编号")
private String busSid;

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
View File

@ -75,9 +75,9 @@ public class FinPaymentrecordDto implements Dto {
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "实收金额")
private Integer cost;
private String cost;
@ApiModelProperty(value = "应收金额")
private Integer accountsReceive;
private String accountsReceive;
@ApiModelProperty(value = "业务编号")
private String busSid;
@ApiModelProperty(value = "付款备注")

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
View File

@ -49,7 +49,7 @@ public class FinPaymentrecordUpdateDto implements Dto {
@ApiModelProperty("供应商编码")
private String payCode;
@ApiModelProperty(value = "实收金额")
private Integer cost;
private String cost;
@ApiModelProperty(value = "应收金额")
private Integer accountsReceive;
private String accountsReceive;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
View File

@ -79,9 +79,9 @@ public class FinPaymentrecordVo implements Vo {
@ApiModelProperty(value = "收款账号")
private String receiveBankAccount;
@ApiModelProperty(value = "实收金额")
private Integer cost;
private String cost;
@ApiModelProperty(value = "应收金额")
private Integer accountsReceive;
private String accountsReceive;
@ApiModelProperty(value = "付款凭证")
private List<String> payFiles;

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
View File

@ -512,8 +512,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailVo.getBank());
//金额
if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getPayAccount())) {
finPaymentrecordDto.setCost(Integer.valueOf(finPaymentapplyDetailVo.getPayAccount()));
finPaymentrecordDto.setAccountsReceive(Integer.valueOf(finPaymentapplyDetailVo.getPayAccount()));
finPaymentrecordDto.setCost(finPaymentapplyDetailVo.getPayAccount());
finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailVo.getPayAccount());
}
finPaymentrecordService.saveDto(finPaymentrecordDto);
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -89,6 +89,7 @@ import org.springframework.stereotype.Service;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.NumberFormat;
import java.util.*;
import java.util.concurrent.*;
@ -339,10 +340,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
for (int i = 0; i < sids.size(); i++) {
FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
FinPaymentrecord finPaymentrecordOne = null;
if (dto.getCost() < finPaymentrecord.getAccountsReceive()) {//实收金额小于应收金额
if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive())<0) {//实收金额小于应收金额
finPaymentrecordOne = new FinPaymentrecord();
BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive() - dto.getCost());
finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive().subtract(new BigDecimal(dto.getCost())));
finPaymentrecordOne.setCost(finPaymentrecordOne.getAccountsReceive());
}
BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
@ -515,10 +516,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
}
List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
if (finPaymentrecord.getCost() != null
&& finPaymentrecord.getCost() > 0) {
&& finPaymentrecord.getCost().compareTo(BigDecimal.ZERO)>0) {
ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
//应付金额
fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
//登账日期
fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
//我方银行账号
@ -817,7 +818,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
dataMap.put("receiveCompany", finPaymentrecord.getReceiveCompany());
dataMap.put("receiveBank", finPaymentrecord.getReceiveBank());
dataMap.put("receiveBankAccount", finPaymentrecord.getReceiveBankAccount());
Double aDouble = Double.valueOf(finPaymentrecord.getAccountsReceive());
Double aDouble = finPaymentrecord.getAccountsReceive().doubleValue();
String s = upperCase2(aDouble);
dataMap.put("cost", finPaymentrecord.getAccountsReceive() + " " + "(" + s + ")");
//获取图片路径
@ -1003,7 +1004,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
for (int i = 0; i < sids.size(); i++) {
FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
finPaymentrecord.setCost(0);
finPaymentrecord.setCost(BigDecimal.ZERO);
baseMapper.updateById(finPaymentrecord);
//更新付款申请中的状态
FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java
View File

@ -707,8 +707,8 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
FinPaymentrecordDto payDto = new FinPaymentrecordDto();
payDto.setBusSid(apply.getSid());
payDto.setCreateBySid(apply.getCreateBySid());
payDto.setCost(entry.getValue().intValue());
payDto.setAccountsReceive(entry.getValue().intValue());
payDto.setCost(entry.getValue().toString());
payDto.setAccountsReceive(entry.getValue().toString());
payDto.setCostTitleKey("008");
payDto.setCostTitleValue("月还");
payDto.setCostTypeKey("006");

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -745,22 +745,22 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
String depositUseRuleKey = outsourcingApplicationDetailsVo.getDepositUseRuleKey();
if (depositUseRuleKey.equals("002")) {
if (deposit > 0) {
finPaymentrecordDto.setCost(price - deposit / num);//付款金额
finPaymentrecordDto.setAccountsReceive(price - deposit / num);//付款金额
finPaymentrecordDto.setCost(String.valueOf(price - deposit / num));//付款金额
finPaymentrecordDto.setAccountsReceive(String.valueOf(price - deposit / num));//付款金额
finPaymentrecordDto.setPayRemark("本车使用订金" + (deposit / num) + "元。");
} else {
finPaymentrecordDto.setCost(price);//付款金额
finPaymentrecordDto.setAccountsReceive(price);//付款金额
finPaymentrecordDto.setCost(String.valueOf(price));//付款金额
finPaymentrecordDto.setAccountsReceive(String.valueOf(price));//付款金额
}
} else if (depositUseRuleKey.equals("001")) {
int i = baseMapper.selectCountByBusSid(scmVehicleExamine.getBusinessSid());
i = i + 1;
if (i > 1) {
finPaymentrecordDto.setCost(price);//付款金额
finPaymentrecordDto.setAccountsReceive(price);//付款金额
finPaymentrecordDto.setCost(String.valueOf(price));//付款金额
finPaymentrecordDto.setAccountsReceive(String.valueOf(price));//付款金额
} else if (i == 1) {
finPaymentrecordDto.setCost(price - deposit);
finPaymentrecordDto.setAccountsReceive(price - deposit);
finPaymentrecordDto.setCost(String.valueOf(price - deposit));
finPaymentrecordDto.setAccountsReceive(String.valueOf(price - deposit));
finPaymentrecordDto.setPayRemark("本车为末台车，使用订金" + deposit + "元。");
}
}

Write Preview
Loading…
Cancel
Save