Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
fe3fb3be8a
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  2. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
  3. 76
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java
  4. 111
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java
  7. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java
  8. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java
  9. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
  10. 60
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  11. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  12. 84
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  13. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java
  14. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java
  15. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  16. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
  17. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  18. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  19. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  20. 21
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  21. 1275
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl
  22. 13
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
  23. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  24. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  25. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java
  26. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  27. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  28. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  29. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  30. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  31. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
  32. 26
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  33. 12
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  34. 76
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@ -59,7 +59,7 @@ public interface BaseVehicleOutApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq);
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java

@ -48,10 +48,10 @@ import java.util.List;
@Component
public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeign {
@Override
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(PagerQuery<BaseVehicleOutApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basevehicleoutapply/listPage无法访问");
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(PagerQuery<BaseVehicleOutApplyQueryNew> pq) {
return null;
}
@Override

76
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@ -0,0 +1,76 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyQuery.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery <br/>
* Description: 车辆出库单 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-12 08:54:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件")
public class BaseVehicleOutApplyQueryNew implements Query {
@ApiModelProperty("物料编码")
private String materialCode;
@ApiModelProperty("销售类型key")
private String typeKey;
@ApiModelProperty("销售日期开始时间")
private String saleDateStart;
@ApiModelProperty("销售日期结束时间")
private String saleDateEnd;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售部门")
private String orgDeptSid;
@ApiModelProperty("销售专员")
private String staffSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("分公司sid")
private String orgSid;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
}

111
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@ -0,0 +1,111 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyVo.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo <br/>
* Description: 车辆出库单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-12 08:54:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆出库单 视图数据对象", description = "车辆出库单 视图数据对象")
public class BaseVehicleOutApplyVoNew implements Vo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("分公司sid")
private String createOrgSid;
@ApiModelProperty("分公司名称")
private String createOrgName;
@ApiModelProperty("简述配置")
private String modelConfig;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("销售类型")
private String type;
@ApiModelProperty("采购类型")
private String manPurOrderTypeValue;
@ApiModelProperty("销售日期")
private String saleDate;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("销售部门")
private String orgName;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("是否为终端客户")
private String isTerminal;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("物料名称")
private String materialName;
@ApiModelProperty("物料编码")
private String materialCode;
@ApiModelProperty("物料sid")
private String materialSid;
@ApiModelProperty("赠品价值")
private String giftsDescription;
@ApiModelProperty("销售折让")
private String salesAllowance;
@ApiModelProperty("中介人1")
private String middleOne;
@ApiModelProperty("返利金额1")
private String rebateMoneyOne;
@ApiModelProperty("中介人2")
private String middleTwo;
@ApiModelProperty("返利金额2")
private String rebateMoneyTwo;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String modelConfigSid;
@ApiModelProperty("车型与配置关联sid")
private String vehModelConfigSid;
@ApiModelProperty("车型配置简称")
private String modelName;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java

@ -106,5 +106,9 @@ public class BaseVehinstallmodel extends BaseEntity {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java

@ -104,6 +104,10 @@ public class BaseVehinstallmodelDetailsVo implements Vo {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
@ApiModelProperty("销售订单中上装价格")
private String topPrice;

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java

@ -76,23 +76,18 @@ public class BaseVehinstallmodelDto implements Dto {
@ApiModelProperty("颜色value")
private String colorValue; // 颜色value
@ApiModelProperty("外廓尺寸_长")
@NotBlank(message = "外廓尺寸长不能为空")
private String wk_long; // 外廓尺寸_长
@ApiModelProperty("外廓尺寸_宽")
@NotBlank(message = "外廓尺寸宽不能为空")
private String wk_wide; // 外廓尺寸_宽
@ApiModelProperty("外廓尺寸_高")
@NotBlank(message = "外廓尺寸高不能为空")
private String wk_high; // 外廓尺寸_高
@ApiModelProperty("板材材质key")
private String plateMaterialKey; // 板材材质key
@ApiModelProperty("板材材质value")
private String plateMaterialValue; // 板材材质value
@ApiModelProperty("板材厚度_底")
@NotBlank(message = "板材厚度底不能为空")
private String plateThicknessBottom; // 板材厚度_底
@ApiModelProperty("板材厚度_边")
@NotBlank(message = "板材厚度边不能为空")
private String plateThicknessEdge; // 板材厚度_边
@ApiModelProperty("篷布滑道key")
private String tarpaulinSlideKey; // 篷布滑道key
@ -114,5 +109,9 @@ public class BaseVehinstallmodelDto implements Dto {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java

@ -55,6 +55,8 @@ public class BaseVehinstallmodelVo implements Vo {
@ApiModelProperty("车辆功能value")
private String vehicleTypeValue; // 车辆功能value
@ApiModelProperty("上装名称key")
private String installNameKey; // 上装名称key
@ApiModelProperty("上装名称value")
private String installNameValue; // 上装名称value
@ApiModelProperty("委改方式value")
@ -91,4 +93,8 @@ public class BaseVehinstallmodelVo implements Vo {
private String floorHeating; // 底板加热
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -56,7 +57,7 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
IPage<BaseVehicleOutApplyVo> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);

60
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -1,13 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew">
SELECT
bvoa.`sid`,
bvo.vinNo,
bvoa.`createOrgSid`,
bv.configName AS modelConfig,
bv.insideCode,
bvo.type,
bvo.manPurOrderTypeValue,
bvoa.`saleDate`,
bvo.`price`,
bvoa.`orgName`,
bvoa.`staffName`,
bvoa.`contractNo`,
CASE
bvoa.isTerminal
WHEN 1
THEN '是'
WHEN 0
THEN '否'
END AS isTerminal,
bvoa.customerName,
bvoa.mobile,
bvo.materialName,
bvo.materialCode,
bvo.giftsDescription,
bvo.salesAllowance,
bvo.middleOne,
bvo.middleTwo,
bvo.rebateMoneyOne,
bvo.rebateMoneyTwo,
bvoa.innerName
FROM
base_vehicle_out_apply bvoa
LEFT JOIN base_vehicle_out bvo
ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.biz.basevehicleoutapply;
import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
/**
* Project: anrui-base(销售出库单) <br/>
@ -65,9 +60,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq){
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleOutApplyVo> pv = baseVehicleOutApplyService.listPageVo(pq);
PagerVo<BaseVehicleOutApplyVoNew> pv = baseVehicleOutApplyService.listPageVo(pq);
return rb.success().setData(pv);
}

84
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -28,22 +28,18 @@ package com.yxt.anrui.base.biz.basevehicleoutapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
@ -60,19 +56,75 @@ import java.util.List;
*/
@Service
public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOutApplyMapper, BaseVehicleOutApply> {
private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQueryNew params) {
QueryWrapper<BaseVehicleOutApply> qw = new QueryWrapper<>();
if (params != null) {
String orgSidPath = params.getOrgSidPath();
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
String orgLevelKey = data.getOrgLevelKey();
if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, 73);
qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
}
//车架号
if (StringUtils.isNotBlank(params.getMaterialCode())) {
qw.like("bvo.materialCode", params.getMaterialCode());
}
//销售类型
if (StringUtils.isNotBlank(params.getTypeKey())) {
qw.eq("bvo.typeKey", params.getTypeKey());
}
//销售日期开始-销售日期结束
qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
);
//合同编号
if (StringUtils.isNotBlank(params.getConcatNo())) {
qw.like("bvo.concatNo", params.getConcatNo());
}
//客户名称
if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("bvo.customerName", params.getCustomerName());
}
//销售部门
if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
qw.eq("bvo.orgSid", params.getOrgDeptSid());
}
//销售人员
if (StringUtils.isNotBlank(params.getStaffSid())) {
qw.eq("bvo.staffSid", params.getStaffSid());
}
//内部编码
if (StringUtils.isNotBlank(params.getInsideCode())) {
qw.like("bv.insideCode", params.getInsideCode());
}
if (StringUtils.isNotBlank(params.getOrgSid())) {
qw.eq("bvo.createOrgSid", params.getOrgSid());
}
}
return qw;
}
public PagerVo<BaseVehicleOutApplyVo> listPageVo(PagerQuery<BaseVehicleOutApplyQuery> pq) {
BaseVehicleOutApplyQuery query = pq.getParams();
public PagerVo<BaseVehicleOutApplyVoNew> listPageVo(PagerQuery<BaseVehicleOutApplyQueryNew> pq) {
BaseVehicleOutApplyQueryNew query = pq.getParams();
QueryWrapper<BaseVehicleOutApply> qw = createQueryWrapper(query);
IPage<BaseVehicleOutApply> page = PagerUtil.queryToPage(pq);
IPage<BaseVehicleOutApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseVehicleOutApplyVo> p = PagerUtil.pageToVo(pagging, null);
IPage<BaseVehicleOutApplyVoNew> pagging = baseMapper.selectPageVo(page, qw);
for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
String createOrgSid = record.getCreateOrgSid();
String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
if (StringUtils.isNotBlank(record.getMaterialCode())){
record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
}
record.setCreateOrgName(createorgName);
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
return p;
}

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java

@ -78,20 +78,22 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign {
String wk_high = dto.getWk_high();
String plateThicknessBottom = dto.getPlateThicknessBottom();
String plateThicknessEdge = dto.getPlateThicknessEdge();
if (StringUtils.isBlank(wk_long)){
return rb.setMsg("外廓尺寸长不能为空");
}
if (StringUtils.isBlank(wk_wide)){
return rb.setMsg("外廓尺寸宽不能为空");
}
if (StringUtils.isBlank(wk_high)){
return rb.setMsg("外廓尺寸高不能为空");
}
if (StringUtils.isBlank(plateThicknessBottom)){
return rb.setMsg("板材厚度底不能为空");
}
if (StringUtils.isBlank(plateThicknessEdge)){
return rb.setMsg("板材厚度边不能为空");
if (!"08".equals(dto.getInstallNameKey())){
if (StringUtils.isBlank(wk_long)){
return rb.setMsg("外廓尺寸长不能为空");
}
if (StringUtils.isBlank(wk_wide)){
return rb.setMsg("外廓尺寸宽不能为空");
}
if (StringUtils.isBlank(wk_high)){
return rb.setMsg("外廓尺寸高不能为空");
}
if (StringUtils.isBlank(plateThicknessBottom)){
return rb.setMsg("板材厚度底不能为空");
}
if (StringUtils.isBlank(plateThicknessEdge)){
return rb.setMsg("板材厚度边不能为空");
}
}
baseVehinstallmodelService.saveOrUpdateDto(dto);
return rb.success();

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java

@ -85,13 +85,16 @@ public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstal
IPage<BaseVehinstallmodelVo> pagging = baseMapper.selectPageVo(page, qw);
List<BaseVehinstallmodelVo> records = pagging.getRecords();
for (BaseVehinstallmodelVo record : records) {
String wk_long = record.getWk_long();
String wk_wide = record.getWk_wide();
String wk_high = record.getWk_high();
record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm");
String plateThicknessBottom = record.getPlateThicknessBottom();
String plateThicknessEdge = record.getPlateThicknessEdge();
record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm");
String installNameKey = record.getInstallNameKey();
if (!"08".equals(installNameKey)){
String wk_long = record.getWk_long();
String wk_wide = record.getWk_wide();
String wk_high = record.getWk_high();
record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm");
String plateThicknessBottom = record.getPlateThicknessBottom();
String plateThicknessEdge = record.getPlateThicknessEdge();
record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm");
}
}
PagerVo<BaseVehinstallmodelVo> p = PagerUtil.pageToVo(pagging, null);
return p;

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -2677,6 +2677,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath());
if (!busList.getData().isEmpty()) {
qw.in("busSid", busList.getData());
}else{
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
if (StringUtils.isNotBlank(params.getName())) {
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@ -151,4 +151,11 @@ public class SolutionsDetailsssVo {
@ApiModelProperty("名义留购价")
private String nominalPrice;
@ApiModelProperty("单台成交价")
private String finalPrice;
@ApiModelProperty("挂车价格")
private String gcPrice;
@ApiModelProperty("上装成交价")
private String szPrice;
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -769,7 +769,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//生成总经理担保书
zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
//生成股东会对外担保决议
gdLetterDownloadUrl = gdLetterDownloadUrl();*/
gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
PdfVo pdfVo = new PdfVo();
if(StringUtils.isNotBlank(carContractDownloadUrl)){
pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
@ -951,10 +951,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
*
* @return
*/
public String gdLetterDownloadUrl() {
public String gdLetterDownloadUrl(AppArrearsCarryDto dto, Map<String, Object> map) {
String url = "";
Map<String, Object> map = new HashMap<>();
String ftl = "gd";
String ftl = "gd2";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
@ -1011,6 +1010,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//购买车辆
map.put("num", vinList.size());
map.put("contractNo", dto.getContractId());
map.put("contractName","《车辆买卖合同》");
map.put("customerName",name);
String commitmentMoneyDate = dto.getCommitmentMoneyDate();
List<String> stringLists = Arrays.asList(commitmentMoneyDate.split("-"));
@ -1269,6 +1270,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("orgName", invoicingDetailsVoResultBean.getData().getName());
map.put("useOrgName",invoicingDetailsVoResultBean.getData().getName());
}
}
map.put("mobile", appOrderDetailsVo.getPhone());

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -398,11 +398,12 @@
</select>
<select id="selectBusinessSid" resultType="java.lang.String">
select bo.sid
select distinct bo.sid
from bus_sales_order bo
left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
<where>
${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' and bo.financePlan = '2'
and length(bv.linkSid)>0
</where>
</select>

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
@Autowired
private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
/**
* 构造查询条件
@ -6384,6 +6386,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
qw.notIn("bv.sid", stringList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid);
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw);
stringList.removeAll(Collections.singleton(null));
return rb.success().setData(stringList);

21
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
@Autowired
private FinBillVehicleFeign finBillVehicleFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
if (list.size() > 0) {
@ -287,8 +290,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) {
if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
if (baseVehicleCertificateVo != null){
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
}
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
List<TrailerVo> trailerVos = traliveredVo.getList();
if (trailerVos != null && trailerVos.size() > 0) {
@ -329,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
qw.notIn("bv.linkSid", vinSidList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo());
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
List<QCarVo> list = baseMapper.getCanUseCars(qw);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
@ -388,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
qw.notIn("bv.linkSid", vinSidList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
List<QCarVo> list = pagging.getRecords();

1275
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl

File diff suppressed because it is too large

13
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -203,6 +204,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
vo.setCustomerSid(customerSid);
vo.setUserSid(userSid);
List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
dataVos.removeAll(Collections.singleton(null));
if (dataVos.size() > 0) {
for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
String createTime = appCustomerArchivesDataVo.getCreateTime();
@ -212,10 +214,15 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
appCustomerArchivesDataVo.setLastUploadTime(s);
String sid = appCustomerArchivesDataVo.getSid();
List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid);
listVo.removeAll(Collections.singleton(null));
List<String> list = new ArrayList<>();
for (CrmFile crmFile : listVo) {
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
list.add(url);
if(!listVo.isEmpty()){
for (CrmFile crmFile : listVo) {
if(StringUtils.isNotBlank(crmFile.getFilePath())){
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
list.add(url);
}
}
}
appCustomerArchivesDataVo.setFiles(list);
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@ -108,4 +108,11 @@ public interface FinUncollectedReceivablesDetailedFeign {
@GetMapping("/receivedSelect")
ResultBean<ReceiveInvoiceVo> receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid);
@ApiOperation("查询车辆的应收未收款项")
@GetMapping("/selectByContractNoOne")
ResultBean<List<String>> selectByContractNoOne(@RequestParam("contractNo") String contractNo);
@ApiOperation("查询车辆的应收未收款项")
@GetMapping("/selectByCreateBySidOne")
ResultBean<List<String>> selectByCreateBySidOne(@RequestParam("userSid") String userSid);
}

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@ -116,4 +116,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
return null;
}
@Override
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
return null;
}
@Override
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
return null;
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java

@ -27,6 +27,8 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
private String customerName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车辆sid")
private String vehicleSid;
@ApiModelProperty("发票类别")
private String invoiceType;
@ApiModelProperty("开票类型Key")

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -3156,6 +3156,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
@ -3240,6 +3241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
@ -3314,7 +3316,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细:首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
@ -3325,6 +3326,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "订金", contractNo);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@ -95,4 +95,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
@Select("SELECT sid FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{sid}")
List<String> fetchYsSidByOrderVehSid(String sid);
List<String> selectByContractNoOne(String contractNo);
List<String> selectByCreateBySidOne(String userSid);
}

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@ -148,4 +148,14 @@
WHERE
furd.busVinSid = #{busVinSid}
</select>
<select id="selectByContractNoOne" resultType="java.lang.String">
select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
where fun.contractNo = #{contractNo} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
</select>
<select id="selectByCreateBySidOne" resultType="java.lang.String">
select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
where fun.createBySid = #{userSid} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
</select>
</mapper>

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@ -137,6 +137,16 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid);
}
@Override
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
return finUncollectedReceivablesDetailedService.selectByContractNoOne(contractNo);
}
@Override
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid);
}
@Override
public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -210,7 +210,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
} else {
if ("2".equals(v.getPayTypeKey())) {
v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
}else{
} else {
v.setVIN(temporaryNo);
}
}
@ -779,4 +779,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
public List<String> fetchYsSidByOrderVehSid(String sid) {
return baseMapper.fetchYsSidByOrderVehSid(sid);
}
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.selectByContractNoOne(contractNo);
return rb.success().setData(stringList);
}
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.selectByCreateBySidOne(userSid);
return rb.success().setData(stringList);
}
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@ -159,6 +159,7 @@
v.contractNo,
v.customerName,
v.VIN as vinNo,
v.vehicleSid,
v.invoiceType,
v.invoiceTypeKey,
v.invoiceAmount,

26
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -3,7 +3,11 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.fin.api.finbillfile.FinBillFile;
@ -57,6 +61,12 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
@Autowired
private BaseTrailerFeign baseTrailerFeign;
public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) {
FinVehicleInvoiceQuery query = pq.getParams();
QueryWrapper<FinVehicleInvoice> qw = createQueryWrapper(query);
@ -239,17 +249,23 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
}
List<String> certificatePaths = new ArrayList<>();
//查询合格证 先判断是主车还是挂车
if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) {
if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getVehicleSid())) {
if ("主车".equals(finVehicleInvoice.getVehicleType())) {
List<String> vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(finVehicleInvoice.getBillingSid()).getData();
vo.setCertificatePaths(vehicleAppendixList);
BaseVehicleCertificateVo certificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finVehicleInvoice.getVehicleSid()).getData();
if (null != certificateVo) {
String certificateVoSid = certificateVo.getSid();
List<String> vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(certificateVoSid).getData();
vo.setCertificatePaths(vehicleAppendixList);
}
} else {
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(finVehicleInvoice.getBillingSid()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(finVehicleInvoice.getVehicleSid()).getData();
if (null != commonAppendixVos) {
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (null != commonAppendixVo) {
if (StringUtils.isNotBlank(commonAppendixVo.getFileUrl())) {
certificatePaths.add(commonAppendixVo.getFileUrl());
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
certificatePaths.add(commonAppendixVo.getFileUrl());
}
}
}
}

12
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -422,7 +422,7 @@ public class AppBusAdvanceGinvoiceapplyService {
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
@ -530,7 +530,7 @@ public class AppBusAdvanceGinvoiceapplyService {
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
@ -610,9 +610,9 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept());
submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());
@ -1084,9 +1084,9 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept());
submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());

76
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -428,35 +428,53 @@ public class AppBusDeliveredApplyService {
//成交价2个格
String topPrice = baseVehinstallmodelDetailsVo.getTopPrice();
configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2));
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
//外廓尺寸
configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1));
//颜色
configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1));
//板材材质
configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1));
//板材厚度
configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1));
//篷布滑道
configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1));
//冷藏冷机
configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1));
//自卸液压盖版
configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1));
//底板加热
configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1));
//更多配置2个格
configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2));
String installNameKey = baseVehinstallmodelDetailsVo.getInstallNameKey();
if("08".equals(installNameKey)){
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
configVoList.add(getConfigValueSpanSize("冷机品牌", baseVehinstallmodelDetailsVo.getCoolerBrand(), 1));
configVoList.add(getConfigValueSpanSize("冷机型号", baseVehinstallmodelDetailsVo.getCoolerModel(), 1));
}else{
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
//外廓尺寸
configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1));
//颜色
configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1));
//板材材质
configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1));
//板材厚度
configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1));
//篷布滑道
configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1));
//冷藏冷机
configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1));
//自卸液压盖版
configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1));
//底板加热
configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1));
//更多配置2个格
configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2));
}
handCarInfo.add(configVoList);
}

Loading…
Cancel
Save