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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 1 year ago
parent
d2ca8734a2 be40ff9d17
commit
1a3a83d3d3
6 changed files with 165 additions and 75 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. 38
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  3. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  4. 69
      doc/databases/yxt-as.sql
  5. 55
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
  6. 60
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java

38
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -3891,12 +3891,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal a1 = baseMapper.selectA1(busVinSid);
// BigDecimal a2 = baseMapper.selectA2(busVinSid);
List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
BigDecimal a3 = baseMapper.selectA3(stringList);
stringList.removeAll(Collections.singleton(null));
BigDecimal a3 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
a3 = baseMapper.selectA3(stringList);
}
unall = unall.add(a1).add(a3);
List<String> unList = baseMapper.selectUnA(busVinSid);
//已收
BigDecimal a4 = baseMapper.selectA4(unList);
BigDecimal a5 = baseMapper.selectA5(stringList);
unList.removeAll(Collections.singleton(null));
BigDecimal a4 = BigDecimal.ZERO;
if(!unList.isEmpty()){
//已收
a4 = baseMapper.selectA4(unList);
}
BigDecimal a5 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
a5 = baseMapper.selectA5(stringList);
}
yAll = yAll.add(a4).add(a5);
}
@ -3905,13 +3917,25 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (loanRepaymentPlanDetails != null) {
busVinSid = loanRepaymentPlanDetails.getBusVinSid();
List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
BigDecimal a3 = baseMapper.selectA3(stringList);
stringList.removeAll(Collections.singleton(null));
BigDecimal a3 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
a3 = baseMapper.selectA3(stringList);
}
BigDecimal a1 = baseMapper.selectA1(busVinSid);
unall = unall.add(a1).add(a3);
List<String> unList = baseMapper.selectUnA(busVinSid);
//已收
BigDecimal a4 = baseMapper.selectA4(unList);
BigDecimal a5 = baseMapper.selectA5(stringList);
unList.removeAll(Collections.singleton(null));
BigDecimal a4 = BigDecimal.ZERO;
if(!unList.isEmpty()){
//已收
a4 = baseMapper.selectA4(unList);
}
BigDecimal a5 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
a5 = baseMapper.selectA5(stringList);
}
yAll = yAll.add(a4).add(a5);
}
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -751,10 +751,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum())){
LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(loanHomevisitInvestigateCustomerDto.getMainSid());
if (loanHomevisitPrep != null){
if (loanHomevisitPrep != null && StringUtils.isNotBlank(loanHomevisitPrep.getSaleOrderSid())){
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrep.getSaleOrderSid()).getData();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum(), busSalesOrder.getUseOrgSid()).getData();
if (finCompanyInvoicingDetailsVo == null){
if (finCompanyInvoicingDetailsVo == null || StringUtils.isBlank(finCompanyInvoicingDetailsVo.getTaxpayerNo())){
FinCompanyInvoicingDto finCompanyInvoicingDto = new FinCompanyInvoicingDto();
finCompanyInvoicingDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
finCompanyInvoicingDto.setName(loanHomevisitInvestigateCustomerDto.getAccCompName());

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -451,19 +451,19 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
List<File> filesList = new ArrayList<>();
//贷款车辆买卖合同
List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
/*List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
//生成车辆融资协议
List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
//生成还款协议
List<String> hkxyUrls = hkxy(printConfirmDto, conSetUpKey);
//代管车辆委托书
List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);
List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/
//判断是否为高低开
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData();
//查询金融方案
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
//判断是否为高低开，若是则生成开票申请书
List<String> kpsqsUrls = new ArrayList<>();
/* List<String> kpsqsUrls = new ArrayList<>();
if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) {
//开票申请书
kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey);
@ -477,11 +477,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//接收车辆确认书
List<String> jsclqrsUrls = jsclqrs(printConfirmDto, conSetUpKey);
//接收车辆委托书
List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);
List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);*/
//销售订单上装信息
List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
//查询金融方案中挂车信息
List<String> cljszcghtUrls = new ArrayList<>();
/*List<String> cljszcghtUrls = new ArrayList<>();
if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){
//生成车辆及上装采购合同
cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
@ -550,7 +550,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjyUrl);
filesList.add(file);
}
}
}*/
//合并pdf文件
if (filesList.size() > 0) {
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -961,7 +961,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
downInvoAppForm1.setModelName("外廓-长" + baseTrailerModelDetailsVo.getAppearanceSizeLong() + "（米）" + baseTrailerModelDetailsVo.getTrailerTypeValue());
downInvoAppForm1.setNum("1");
downInvoAppForm1.setDj(baseTrailer.getDealPrice().toString());
downInvoAppForm1.setKpje(baseTrailer.getOneBillMoney().toString());
downInvoAppForm1.setKpje(solutionsDetailsVo.getTrailerAmount());
downInvoAppForm1.setFplx("机动车统一销售发票");
downInvoAppForms.add(downInvoAppForm1);
}

69
doc/databases/yxt-as.sql
View File

@ -69,37 +69,44 @@ CREATE TABLE `as_busrepair_inventorybill`
DROP TABLE IF EXISTS `as_busrepair_inventorybill_detail`;
CREATE TABLE `as_busrepair_inventorybill_detail`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
`inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
`goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
`goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
`goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码（图号）',
`specification` varchar(64) DEFAULT NULL COMMENT '规格',
`goodsModel` varchar(64) DEFAULT NULL COMMENT '型号',
`currentCount` decimal(10,0) DEFAULT NULL COMMENT '出库前的库存量',
`unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
`warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
`warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
`warehouseArea` varchar(64) DEFAULT NULL COMMENT '货位',
`needCount` decimal(10,0) DEFAULT NULL COMMENT '需求数量（维修工单中）',
`outboundCount` decimal(10,0) DEFAULT NULL COMMENT '已出库数量（维修工单中，计算）',
`count` decimal(10,0) DEFAULT NULL COMMENT '出/退库数量',
`price` decimal(10, 2) DEFAULT NULL COMMENT '销售价（元）',
`subjectSid` varchar(64) DEFAULT NULL COMMENT '科目sid',
`subject` varchar(64) DEFAULT NULL COMMENT '科目',
`operUserSid` varchar(64) DEFAULT NULL COMMENT '领料人sid',
`operName` varchar(64) DEFAULT NULL COMMENT '领料人姓名',
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
`sitemSid` varchar(64) DEFAULT NULL COMMENT '工单服务项目记录sid',
`inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
`goodsID` varchar(64) DEFAULT NULL COMMENT '商品ID',
`goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
`goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
`goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
`goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
`goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品编码（图号）',
`goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
`currentCount` decimal(10, 0) DEFAULT NULL COMMENT '出库前的库存量',
`unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
`warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
`warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
`warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位Sid',
`warehouseRackCode` varchar(64) DEFAULT NULL COMMENT '库位编号',
`needCount` decimal(10, 0) DEFAULT NULL COMMENT '需求数量（维修工单中）',
`count` decimal(10, 0) DEFAULT NULL COMMENT '出/退库数量',
`price` decimal(10, 2) DEFAULT NULL COMMENT '销售价（元）',
`discountAmount` decimal(10, 2) DEFAULT NULL COMMENT '优惠金额（=销售价*(1-折扣*0.1））',
`amount` decimal(10, 2) DEFAULT NULL COMMENT '金额（销售价-优惠金额）',
`discount` int(32) DEFAULT NULL COMMENT '折扣（0-10，0免费，10不打折）',
`subjectSid` varchar(64) DEFAULT NULL COMMENT '科目sid',
`subject` varchar(64) DEFAULT NULL COMMENT '科目',
`operUserSid` varchar(64) DEFAULT NULL COMMENT '领料人sid',
`operName` varchar(64) DEFAULT NULL COMMENT '领料人姓名',
`oldIsReclaim` int(32) DEFAULT NULL COMMENT '旧件是否收回登记（0未收回登记，1已收回登记）',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB

55
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
View File

@ -16,18 +16,34 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private static final long serialVersionUID = 7134535185685249599L;
@ApiModelProperty("单据sid")
private String billSid;
//工单服务项目记录sid
private String sitemSid;
@ApiModelProperty("商品库存sid")
private String inventorySid;
@ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;
@ApiModelProperty("商品编码")
//商品ID
private String goodsID;
//商品基础信息sid
private String goodSpuSid;
//商品名称
private String goodsSpuName;
//商品Skusid
private String goodsSkuSid;
//商品Sku名称
private String goodsSkuTitle;
//商品编码（图号）
private String goodsSkuCode;
//规格型号
private String goodsSkuOwnSpec;
/* @ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;*/
/* @ApiModelProperty("商品编码")
private String goodsCode;
@ApiModelProperty("规格")
private String specification;
@ApiModelProperty("型号")
private String goodsModel;
private String goodsModel;*/
@ApiModelProperty("出库前的库存量")
private BigDecimal currentCount;
@ApiModelProperty("计量单位")
@ -36,16 +52,30 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("货位")
private String warehouseArea;
@ApiModelProperty("需求数量")
//库位Sid
private String warehouseRackSid;
//库位编号
private String warehouseRackCode;
/* @ApiModelProperty("货位")
private String warehouseArea;*/
@ApiModelProperty("需求数量（维修工单中）")
private BigDecimal needCount;
@ApiModelProperty("已出库数量")
private BigDecimal outboundCount;
/* @ApiModelProperty("已出库数量")
private BigDecimal outboundCount;*/
@ApiModelProperty("出/退库数量")
private BigDecimal count;
@ApiModelProperty("销售价（元）")
private BigDecimal price;
//折扣（0-10，0免费，10不打折）
private Integer discount;
//优惠金额（=销售价*(1-折扣*0.1））
private BigDecimal discountAmount;
//金额（销售价-优惠金额）
private BigDecimal amount;
@ApiModelProperty("科目sid")
private String subjectSid;
@ApiModelProperty("科目")
@ -54,4 +84,7 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private String operUserSid;
@ApiModelProperty("领料人姓名")
private String operName;
//旧件是否收回登记（0未收回登记，1已收回登记）
private Integer oldIsReclaim;
}

60
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,16 +16,31 @@ public class AsBusrepairInventorybillDetailDto {
@ApiModelProperty("商品库存sid")
private String inventorySid;
@ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;
@ApiModelProperty("商品编码")
private String goodsCode;
@ApiModelProperty("规格")
private String specification;
@ApiModelProperty("型号")
private String goodsModel;
//商品ID
@JsonProperty("goodsID")
private String goodsID;
//商品基础信息sid
private String goodSpuSid;
//商品名称
private String goodsSpuName;
//商品Skusid
private String goodsSkuSid;
//商品Sku名称
private String goodsSkuTitle;
//商品编码（图号）
private String goodsSkuCode;
//规格型号
private String goodsSkuOwnSpec;
/* @ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;
@ApiModelProperty("商品编码")
private String goodsCode;
@ApiModelProperty("规格")
private String specification;
@ApiModelProperty("型号")
private String goodsModel;*/
@ApiModelProperty("出库前的库存量")
private BigDecimal currentCount;
@ApiModelProperty("计量单位")
@ -33,16 +49,26 @@ public class AsBusrepairInventorybillDetailDto {
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("货位")
private String warehouseArea;
//库位Sid
private String warehouseRackSid;
//库位编号
private String warehouseRackCode;
/*@ApiModelProperty("货位")
private String warehouseArea;*/
@ApiModelProperty("需求数量")
private BigDecimal needCount;
@ApiModelProperty("已出库数量")
private BigDecimal outboundCount;
private String needCount;
/* @ApiModelProperty("已出库数量")
private BigDecimal outboundCount;*/
@ApiModelProperty("出/退库数量")
private BigDecimal count;
private String count;
@ApiModelProperty("销售价（元）")
private BigDecimal price;
private String price;
//折扣（0-10，0免费，10不打折）
private Integer discount;
//优惠金额（=销售价*(1-折扣*0.1））
private BigDecimal discountAmount;
//金额（销售价-优惠金额）
private BigDecimal amount;
@ApiModelProperty("科目sid")
private String subjectSid;
@ApiModelProperty("科目")

Write Preview
Loading…
Cancel
Save