Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
c108e98ed2
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java
  4. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleCostListQuery.java
  6. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  8. 20
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutMaterial.java
  9. 19
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java
  10. 94
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java
  11. 95
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java
  12. 95
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java
  13. 78
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  14. 72
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
  15. 93
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQuery.java
  16. 95
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVo.java
  17. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
  18. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
  19. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  20. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
  21. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  22. 221
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  23. 65
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
  24. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  25. 100
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  26. 110
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  27. 2465
      anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl
  28. 3533
      anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl
  29. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java
  30. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java
  31. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
  32. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  33. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java
  34. 8
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  35. 20
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  36. 8
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java

@ -60,5 +60,6 @@ public class BasePurchaseSystem extends BaseEntity {
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java

@ -61,5 +61,6 @@ public class BasePurchaseSystemDetailsVo implements Vo {
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java

@ -61,5 +61,6 @@ public class BasePurchaseSystemDto implements Dto {
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java

@ -61,5 +61,6 @@ public class BasePurchaseSystemVo implements Vo {
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleCostListQuery.java

@ -24,4 +24,6 @@ public class VehicleCostListQuery implements Query {
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty("当前组织机构sid全路径")
private String orgPath;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@ -108,4 +108,6 @@ public class BaseVehicleOut extends BaseEntity {
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("主表sid")
private String mainSid; // 主表sid
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@ -50,7 +50,7 @@ public interface BaseVehicleOutFeign {
@ApiOperation("生成销售出库单pdf")
@PostMapping("/createPdf")
@ResponseBody
ResultBean<PdfPath> createPdf(@RequestBody BaseVehicleOutPdf baseVehicleOutPdf);
ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid);
}

20
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutMaterial.java

@ -13,27 +13,25 @@ import lombok.Data;
public class BaseVehicleOutMaterial {
@ApiModelProperty("物料编码")
@JsonProperty("mNum")
private String mNum;
private String mnum;
@ApiModelProperty("物料分组")
@JsonProperty("mGroup")
private String mGroup;
private String mgroup;
@ApiModelProperty("车辆类型")
private String vehicleTypeValue;
private String vtype;
@ApiModelProperty("计量单位")
private String inventoryUnit;
private String iunit;
@ApiModelProperty("数量")
private String num;
private String sl;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("返利人")
private String rebatePeo;
private String flr;
@ApiModelProperty("返利金额")
private String rebateMoney;
private String flje;
@ApiModelProperty("赠送套餐")
private String complimentaryPackage;
private String zstc;
@ApiModelProperty("销售折让")
private String salesAllowance;
private String xszr;
@ApiModelProperty("备注")
private String remarks;
}

19
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java

@ -1,19 +0,0 @@
package com.yxt.anrui.base.api.basevehicleout;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/29 12:00
* @Description
*/
@Data
public class BaseVehicleOutPdf {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("销售类型")
private String saleType;
}

94
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java

@ -0,0 +1,94 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApply.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply <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 = "车辆出库单")
@TableName("base_vehicle_out_apply")
public class BaseVehicleOutApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("销售日期")
private String saleDate; // 销售日期
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("销售部门sid")
private String orgSid; // 销售部门sid
@ApiModelProperty("销售部门名称")
private String orgName; // 销售部门名称
@ApiModelProperty("销售专员sid")
private String staffSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String staffName; // 销售专员
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("客户手机号")
private String mobile; // 客户手机号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("总成交价")
private String totalDealPrice; // 总成交价
@ApiModelProperty("制单人sid")
private String makeListSid; // 制单人sid
@ApiModelProperty("制单人姓名")
private String makeListName; // 制单人姓名
@ApiModelProperty("制单日期")
private String makeListDate; // 制单日期
@ApiModelProperty("审核人sid")
private String confirmSid; // 审核人sid
@ApiModelProperty("审核人姓名")
private String confirmName; // 审核人姓名
@ApiModelProperty("审核日期")
private String confirmDate; // 审核日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

95
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java

@ -0,0 +1,95 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _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 BaseVehicleOutApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("销售日期")
private String saleDate; // 销售日期
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("销售部门sid")
private String orgSid; // 销售部门sid
@ApiModelProperty("销售部门名称")
private String orgName; // 销售部门名称
@ApiModelProperty("销售专员sid")
private String staffSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String staffName; // 销售专员
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("客户手机号")
private String mobile; // 客户手机号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("总成交价")
private String totalDealPrice; // 总成交价
@ApiModelProperty("制单人sid")
private String makeListSid; // 制单人sid
@ApiModelProperty("制单人姓名")
private String makeListName; // 制单人姓名
@ApiModelProperty("制单日期")
private String makeListDate; // 制单日期
@ApiModelProperty("审核人sid")
private String confirmSid; // 审核人sid
@ApiModelProperty("审核人姓名")
private String confirmName; // 审核人姓名
@ApiModelProperty("审核日期")
private String confirmDate; // 审核日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

95
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java

@ -0,0 +1,95 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyDto.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto <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 BaseVehicleOutApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("销售日期")
private String saleDate; // 销售日期
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("销售部门sid")
private String orgSid; // 销售部门sid
@ApiModelProperty("销售部门名称")
private String orgName; // 销售部门名称
@ApiModelProperty("销售专员sid")
private String staffSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String staffName; // 销售专员
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("客户手机号")
private String mobile; // 客户手机号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("总成交价")
private String totalDealPrice; // 总成交价
@ApiModelProperty("制单人sid")
private String makeListSid; // 制单人sid
@ApiModelProperty("制单人姓名")
private String makeListName; // 制单人姓名
@ApiModelProperty("制单日期")
private String makeListDate; // 制单日期
@ApiModelProperty("审核人sid")
private String confirmSid; // 审核人sid
@ApiModelProperty("审核人姓名")
private String confirmName; // 审核人姓名
@ApiModelProperty("审核日期")
private String confirmDate; // 审核日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

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

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyFeign.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign <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
*/
@Api(tags = "车辆出库单")
@FeignClient(
contextId = "anrui-base-BaseVehicleOutApply",
name = "anrui-base",
path = "v1/basevehicleoutapply",
fallback = BaseVehicleOutApplyFeignFallback.class)
public interface BaseVehicleOutApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

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

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package 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;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeignFallback <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
*/
@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无法访问");
}
@Override
public ResultBean save(BaseVehicleOutApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicleoutapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicleoutapply/delBySids无法访问");
}
@Override
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basevehicleoutapply/fetchDetailsBySid无法访问");
}
}

93
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQuery.java

@ -0,0 +1,93 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _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 BaseVehicleOutApplyQuery implements Query {
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("销售日期")
private String saleDate; // 销售日期
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("销售部门sid")
private String orgSid; // 销售部门sid
@ApiModelProperty("销售部门名称")
private String orgName; // 销售部门名称
@ApiModelProperty("销售专员sid")
private String staffSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String staffName; // 销售专员
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("客户手机号")
private String mobile; // 客户手机号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("总成交价")
private String totalDealPrice; // 总成交价
@ApiModelProperty("制单人sid")
private String makeListSid; // 制单人sid
@ApiModelProperty("制单人姓名")
private String makeListName; // 制单人姓名
@ApiModelProperty("制单日期")
private String makeListDate; // 制单日期
@ApiModelProperty("审核人sid")
private String confirmSid; // 审核人sid
@ApiModelProperty("审核人姓名")
private String confirmName; // 审核人姓名
@ApiModelProperty("审核日期")
private String confirmDate; // 审核日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

95
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVo.java

@ -0,0 +1,95 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _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 BaseVehicleOutApplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("销售日期")
private String saleDate; // 销售日期
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("销售部门sid")
private String orgSid; // 销售部门sid
@ApiModelProperty("销售部门名称")
private String orgName; // 销售部门名称
@ApiModelProperty("销售专员sid")
private String staffSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String staffName; // 销售专员
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("客户手机号")
private String mobile; // 客户手机号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("总成交价")
private String totalDealPrice; // 总成交价
@ApiModelProperty("制单人sid")
private String makeListSid; // 制单人sid
@ApiModelProperty("制单人姓名")
private String makeListName; // 制单人姓名
@ApiModelProperty("制单日期")
private String makeListDate; // 制单日期
@ApiModelProperty("审核人sid")
private String confirmSid; // 审核人sid
@ApiModelProperty("审核人姓名")
private String confirmName; // 审核人姓名
@ApiModelProperty("审核日期")
private String confirmDate; // 审核日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@ -71,5 +71,5 @@ public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem>
BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid);
@Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@ -98,7 +98,7 @@ public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSy
if (basePurchaseSystem == null){
return rb.setMsg("该采购系统信息不存在");
}
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid(), dtoSid);
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSidAndSid(dto.getDeptSid(), dtoSid);
if (basePurchaseSystemDetailsVo == null){
this.updateByDto(dto);
return rb.success().setMsg("修改成功");

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -2185,10 +2185,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
VehicleCostListQuery query = pagerQuery.getParams();
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getUserSid())) {
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
if(StringUtils.isNotBlank(query.getOrgPath())){
ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
qw.eq("bv.useOrgSid", resultBean.getData());
}else{
if (StringUtils.isNotBlank(query.getUserSid())) {
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
qw.eq("bv.useOrgSid", resultBean.getData());
}
}
if (query.getSidList().size() > 0) {
qw.notIn("bv.vinNo", query.getSidList());
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -32,4 +33,7 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
int selectCountBySidVin(String vinSid);
String selectNum(String billNo);
@Select("select * from base_vehicle_out where mainSid = #{xsckdSid}")
List<BaseVehicleOut> fetchByMainSid(String xsckdSid);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@ -53,9 +53,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
}
@Override
public ResultBean<PdfPath> createPdf(BaseVehicleOutPdf baseVehicleOutPdf) {
public ResultBean<PdfPath> createPdf(String xsckdSid) {
ResultBean rb = ResultBean.fireFail();
PdfPath pdf = baseVehicleOutService.createPdf(baseVehicleOutPdf);
PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid);
return rb.success().setData(pdf);
}
}

221
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -10,12 +10,14 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehicleout.*;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService;
import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
@ -32,6 +34,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.PagerUtil;
@ -49,7 +53,6 @@ import java.math.BigDecimal;
import java.util.*;
import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
import static java.util.Comparator.comparing;
/**
* @Author dimengzhe
@ -79,10 +82,26 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService;
public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
ResultBean rb = ResultBean.fireFail();
Boolean b = false;
BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply();
baseVehicleOutApply.setSaleDate(dto.getSaleDate());
baseVehicleOutApply.setBillNo(dto.getBillNo());
baseVehicleOutApply.setCustomerSid(dto.getCustomerSid());
baseVehicleOutApply.setCustomerName(dto.getCustomerName());
baseVehicleOutApply.setOrgSid(dto.getOrgSid());
baseVehicleOutApply.setOrgName(dto.getOrgName());
baseVehicleOutApply.setStaffSid(dto.getStaffSid());
baseVehicleOutApply.setStaffName(dto.getStaffName());
baseVehicleOutApply.setMakeListSid(dto.getCreateBySid());
baseVehicleOutApply.setMakeListName(dto.getCreateByName());
baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
/* List<BaseVehicleOutQuery> list = dto.getQueryList();
List<String > stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList());
//根据sid查询出库的车辆是否符合出库条件(库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的,车辆才能出库、可以批量选择)、当选择的车辆不满足条件时,点击出库按钮时
@ -103,9 +122,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
payTypeKey = busSalesOrderDetailsVo.getPayTypeKey();
baseVehicleOutApply.setSaleTypeKey(busSalesOrderDetailsVo.getPayTypeKey());
baseVehicleOutApply.setSaleTypeValue(busSalesOrderDetailsVo.getPayType());
break;
}
}
baseVehicleOutApplyService.save(baseVehicleOutApply);
//取付款方式是否为全款(1全款)
if ("1".equals(payTypeKey)) {
Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
@ -168,7 +190,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
if ("002".equals(baseVehicle.getManPurOrderTypeKey())){
if ("002".equals(baseVehicle.getManPurOrderTypeKey())) {
baseVehicleOut.setZcMGroupCode("99.01");
baseVehicleOut.setZcMGroupName("外采主车");
}
@ -195,16 +217,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
baseVehicleOut.setBillNo(billNo);
String trailerOrInstallName = baseVehicleOut.getTrailerOrInstallName();
if ("上装".equals(trailerOrInstallName)){
if ("上装".equals(trailerOrInstallName)) {
baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
baseVehicleOut.setTrailerOrInstallCode(baseVehicleOut.getVinNo().substring(baseVehicleOut.getVinNo().length() - 8) + "SZ");
}else if ("挂车".equals(trailerOrInstallName)){
} else if ("挂车".equals(trailerOrInstallName)) {
baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
BaseTrailer baseTrailer = baseTrailerService.fetchBySid(baseVehicleOut.getSzOrGCSid());
baseVehicleOut.setTrailerOrInstallCode(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
}
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo);
//更新车辆台账的出库状态等值,库存状态修改为出库,销售日期修改为当天,成交价,备注
@ -228,7 +251,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
finKingDeeFeign.draftBdCustomer(bdMiddle);
}
//创建出库单数据对象前 需要将客户的编码修改为新生成的客户的编码。
if (StringUtils.isNotBlank(bdCustomer.getFNumber())){
if (StringUtils.isNotBlank(bdCustomer.getFNumber())) {
dto.setCustomerNo(bdCustomer.getFNumber());
}
SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
@ -249,13 +272,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
//推送金蝶上装/挂车销售出库单
String trailerOrInstall = dto.getTrailerOrInstall();
if (StringUtils.isNotBlank(trailerOrInstall)){
if (StringUtils.isNotBlank(trailerOrInstall)) {
SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
finKingDeeFeign.draftSalOutStock(salOutStock);
List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
for (SalOutStock.FEntity entity : fEntity) {
String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
if ("G".equals(substring)){
if ("G".equals(substring)) {
String gcSid = dto.getSzOrGCSid();
BaseTrailer baseTrailer = baseTrailerService.fetchBySid(gcSid);
baseTrailer.setStockStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
@ -264,7 +287,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseTrailer.setDealPrice(dealPrice);
baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
baseTrailerService.saveOrUpdate(baseTrailer);
}else if ("Z".equals(substring)){
} else if ("Z".equals(substring)) {
String szSid = dto.getSzOrGCSid();
BaseVehinstall baseVehinstall = baseVehinstallService.fetchBySid(szSid);
baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
@ -842,106 +865,116 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
return rb.success().setData(maps);
}
public PdfPath createPdf(BaseVehicleOutPdf baseVehicleOutPdf) {
public PdfPath createPdf(String xsckdSid) {
PdfPath pdfPath = new PdfPath();
BaseVehicleOut baseVehicleOut = fetchBySid(baseVehicleOutPdf.getSid());
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleOut.getVinSid());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(baseVehicle.getModelSid());
//获取销售出库单信息
BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(xsckdSid);
//获取销售出库单车辆信息
List<BaseVehicleOut> baseVehicleOuts = baseMapper.fetchByMainSid(xsckdSid);
//获取创建人姓名
String createBySid = baseVehicleOutApply.getCreateBySid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(createBySid).getData();
String createByName = sysStaffinfoFeign.fetchBySid(sysUserVo.getStaffSid()).getData().getName();
Map<String, Object> dataMap = new HashMap<String, Object>();
//销售类型
dataMap.put("saleType",baseVehicleOutPdf.getSaleType());
dataMap.put("saleType", baseVehicleOutApply.getSaleTypeValue());
//销售日期
dataMap.put("saleDate", baseVehicleOut.getSaleDate());
dataMap.put("saleDate", baseVehicleOutApply.getSaleDate());
//单据编号
dataMap.put("billNo", baseVehicleOut.getBillNo());
//客户名称
dataMap.put("cName", baseVehicleOut.getCustomerName());
//电话
dataMap.put("mobile", baseVehicleOut.getMobile());
dataMap.put("billNo", baseVehicleOutApply.getBillNo());
//客户名称电话
dataMap.put("cName", baseVehicleOutApply.getCustomerName() + baseVehicleOutApply.getMobile());
//销售部门
dataMap.put("oName", baseVehicleOut.getOrgName());
dataMap.put("oName", baseVehicleOutApply.getOrgName());
//销售专员
dataMap.put("sName", baseVehicleOut.getStaffName());
dataMap.put("sName", baseVehicleOutApply.getStaffName());
List<BaseVehicleOutMaterial> baseVehicleOutMaterials = new ArrayList<>();
BaseVehicleOutMaterial baseVehicleOutMaterialZC = new BaseVehicleOutMaterial();
//主车物料编码
String num = "1";
BigDecimal tPrice = baseVehicleOut.getPrice();
if (StringUtils.isNotBlank(baseVehicleOut.getTrailerOrInstallDealPrice())){
BigDecimal trailerOrInstallDealPrice = new BigDecimal(baseVehicleOut.getTrailerOrInstallDealPrice());
tPrice = tPrice.add(trailerOrInstallDealPrice);
}
baseVehicleOutMaterialZC.setMNum(baseVehicleOut.getVinNo().substring(baseVehicleOut.getVinNo().length() - 8));
baseVehicleOutMaterialZC.setMGroup(baseVehicleOut.getZcMGroupName());
baseVehicleOutMaterialZC.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
baseVehicleOutMaterialZC.setInventoryUnit("辆");
baseVehicleOutMaterialZC.setNum(num);
baseVehicleOutMaterialZC.setPrice(baseVehicleOut.getPrice().toString());
baseVehicleOutMaterialZC.setRebatePeo(baseVehicleOut.getMiddleOne());
BigDecimal rebateMoneyOne = baseVehicleOut.getRebateMoneyOne();
BigDecimal rebateMoneyTwo = baseVehicleOut.getRebateMoneyTwo();
BigDecimal rebateMoney = rebateMoneyOne.add(rebateMoneyTwo);
baseVehicleOutMaterialZC.setRebateMoney(rebateMoney.toString());
baseVehicleOutMaterialZC.setComplimentaryPackage(baseVehicleOut.getGiftsDescription());
baseVehicleOutMaterialZC.setSalesAllowance(baseVehicleOut.getSalesAllowance().toString());
baseVehicleOutMaterialZC.setRemarks(baseVehicleOut.getRemarks());
baseVehicleOutMaterials.add(baseVehicleOutMaterialZC);
if (StringUtils.isNotBlank(baseVehicleOut.getSzOrGCSid())){
if ("上装".equals(baseVehicleOut.getTrailerOrInstallName())){
BaseVehicleOutMaterial baseVehicleOutMaterialSZ = new BaseVehicleOutMaterial();
//上装物料编码
baseVehicleOutMaterialSZ.setMNum(baseVehicleOut.getTrailerOrInstallCode());
//上装物料分组
baseVehicleOutMaterialSZ.setMGroup(baseVehicleOut.getTrailerOrInstallMGroupName());
//上装车辆类型
baseVehicleOutMaterialSZ.setVehicleTypeValue(baseVehicleOut.getTrailerOrInstallName());
//上装计量单位
baseVehicleOutMaterialSZ.setInventoryUnit("辆");
//上装数量
baseVehicleOutMaterialSZ.setNum(num);
int i = Integer.parseInt(num);
i = i++;
num = String.valueOf(i);
//上装成交价
baseVehicleOutMaterialSZ.setPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
baseVehicleOutMaterials.add(baseVehicleOutMaterialSZ);
}else if ("挂车".equals(baseVehicleOut.getTrailerOrInstallName())){
BaseVehicleOutMaterial baseVehicleOutMaterialGC = new BaseVehicleOutMaterial();
//挂车物料编码
baseVehicleOutMaterialGC.setMNum(baseVehicleOut.getTrailerOrInstallCode());
//挂车物料分组
baseVehicleOutMaterialGC.setMGroup(baseVehicleOut.getTrailerOrInstallMGroupName());
//挂车车辆类型
baseVehicleOutMaterialGC.setVehicleTypeValue(baseVehicleOut.getTrailerOrInstallName());
//挂车计量单位
baseVehicleOutMaterialGC.setInventoryUnit("辆");
//挂车数量
baseVehicleOutMaterialGC.setNum(num);
int i = Integer.parseInt(num);
i = i++;
num = String.valueOf(i);
//挂车成交价
baseVehicleOutMaterialGC.setPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
baseVehicleOutMaterials.add(baseVehicleOutMaterialGC);
//初始化总数量为1
int num = 0;
BigDecimal tPrice = new BigDecimal(0);
BigDecimal tRebateMoney = new BigDecimal(0);
BigDecimal tGiftsDescription = new BigDecimal(0);
BigDecimal tSalesAllowance = new BigDecimal(0);
//循环获取车辆信息
for (BaseVehicleOut baseVehicleOut : baseVehicleOuts) {
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleOut.getVinSid());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(baseVehicle.getModelSid());
BaseVehicleOutMaterial baseVehicleOutMaterialZC = new BaseVehicleOutMaterial();
tPrice = tPrice.add(baseVehicleOut.getPrice());
num = num + 1;
if (StringUtils.isNotBlank(baseVehicleOut.getTrailerOrInstallDealPrice())) {
BigDecimal trailerOrInstallDealPrice = new BigDecimal(baseVehicleOut.getTrailerOrInstallDealPrice());
tPrice = tPrice.add(trailerOrInstallDealPrice);
num = num + 1;
}
//主车物料编码
baseVehicleOutMaterialZC.setMnum(baseVehicleOut.getVinNo().substring(baseVehicleOut.getVinNo().length() - 8));
baseVehicleOutMaterialZC.setMgroup(baseVehicleOut.getZcMGroupName());
baseVehicleOutMaterialZC.setVtype(baseVehicleModel.getVehicleTypeValue());
baseVehicleOutMaterialZC.setIunit("辆");
baseVehicleOutMaterialZC.setSl("1");
baseVehicleOutMaterialZC.setPrice(baseVehicleOut.getPrice().toString());
baseVehicleOutMaterialZC.setFlr(baseVehicleOut.getMiddleOne());
BigDecimal rebateMoneyOne = baseVehicleOut.getRebateMoneyOne();
BigDecimal rebateMoneyTwo = baseVehicleOut.getRebateMoneyTwo();
BigDecimal rebateMoney = rebateMoneyOne.add(rebateMoneyTwo);
baseVehicleOutMaterialZC.setFlje(rebateMoney.toString());
tRebateMoney = tRebateMoney.add(rebateMoney);
baseVehicleOutMaterialZC.setZstc(baseVehicleOut.getGiftsDescription());
tGiftsDescription = tGiftsDescription.add(new BigDecimal(baseVehicleOut.getGiftsDescription()));
baseVehicleOutMaterialZC.setXszr(baseVehicleOut.getSalesAllowance().toString());
tSalesAllowance = tSalesAllowance.add(baseVehicleOut.getSalesAllowance());
baseVehicleOutMaterialZC.setRemarks(baseVehicleOut.getRemarks());
baseVehicleOutMaterials.add(baseVehicleOutMaterialZC);
if (StringUtils.isNotBlank(baseVehicleOut.getSzOrGCSid())) {
if ("上装".equals(baseVehicleOut.getTrailerOrInstallName())) {
BaseVehicleOutMaterial baseVehicleOutMaterialSZ = new BaseVehicleOutMaterial();
//上装物料编码
baseVehicleOutMaterialSZ.setMnum(baseVehicleOut.getTrailerOrInstallCode());
//上装物料分组
baseVehicleOutMaterialSZ.setMgroup(baseVehicleOut.getTrailerOrInstallMGroupName());
//上装车辆类型
baseVehicleOutMaterialSZ.setVtype(baseVehicleOut.getTrailerOrInstallName());
//上装计量单位
baseVehicleOutMaterialSZ.setIunit("辆");
//上装数量
baseVehicleOutMaterialSZ.setSl("1");
//上装成交价
baseVehicleOutMaterialSZ.setPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
baseVehicleOutMaterials.add(baseVehicleOutMaterialSZ);
} else if ("挂车".equals(baseVehicleOut.getTrailerOrInstallName())) {
BaseVehicleOutMaterial baseVehicleOutMaterialGC = new BaseVehicleOutMaterial();
//挂车物料编码
baseVehicleOutMaterialGC.setMnum(baseVehicleOut.getTrailerOrInstallCode());
//挂车物料分组
baseVehicleOutMaterialGC.setMgroup(baseVehicleOut.getTrailerOrInstallMGroupName());
//挂车车辆类型
baseVehicleOutMaterialGC.setVtype(baseVehicleOut.getTrailerOrInstallName());
//挂车计量单位
baseVehicleOutMaterialGC.setIunit("辆");
//挂车数量
baseVehicleOutMaterialGC.setSl("1");
//挂车成交价
baseVehicleOutMaterialGC.setPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
baseVehicleOutMaterials.add(baseVehicleOutMaterialGC);
}
}
}
dataMap.put("wlList", baseVehicleOutMaterials);
dataMap.put("tNum", num);
dataMap.put("tPrice", tPrice.toString());
dataMap.put("tRebateMoney", rebateMoney.toString());
dataMap.put("tComplimentaryPackage", baseVehicleOut.getGiftsDescription());
dataMap.put("tSalesAllowance",baseVehicleOut.getSalesAllowance().toString());
dataMap.put("zs", num);
dataMap.put("zcjj", tPrice.toString());
dataMap.put("zflje", tRebateMoney.toString());
dataMap.put("zzstc", tGiftsDescription.toString());
dataMap.put("zxszr", tSalesAllowance.toString());
String tPriceDX = TransformMoney.transform(tPrice.toString());
dataMap.put("tPriceDX",tPriceDX);
dataMap.put("makeListName",baseVehicleOut.getCreateByName());
dataMap.put("makeListDate",DateUtil.format(new Date(),"yyyy-MM-dd"));
dataMap.put("confirmName","");
dataMap.put("confirmDate","");
dataMap.put("tPriceDX", tPriceDX);
dataMap.put("makeName", createByName);
dataMap.put("makeDate", DateUtil.format(new Date(), "yyyy-MM-dd"));
dataMap.put("confirmName", "");
dataMap.put("confirmDate", "");
//获取模板
//模板路径
String sourcePath = "D:\\anrui\\upload\\template\\";
File file = new File(getClass().getClassLoader().getResource("ftl/xsckd.ftl").getFile());
String dir = getClassLoader().getResource("ftl").getPath();
//生成word文件名
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
@ -953,7 +986,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名
String pdfName = "销售出库单_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, baseVehicleOut.getCreateByName());
WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
return pdfPath;
}

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

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basevehicleoutapply;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyMapper.java <br/>
* Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyMapper <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
*/
@Mapper
public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutApply> {
//@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);
List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
@Select("select * from base_vehicle_out_apply")
List<BaseVehicleOutApplyVo> selectListVo();
}

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

@ -0,0 +1,13 @@
<?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>
</mapper>

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

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basevehicleoutapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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/>
* File: BaseVehicleOutApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyRest <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
*/
@Api(tags = "车辆出库单")
@RestController("com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyRest")
@RequestMapping("v1/basevehicleoutapply")
public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
@Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleOutApplyVo> pv = baseVehicleOutApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto){
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

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

@ -0,0 +1,110 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
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 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.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyService.java <br/>
* Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService <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
*/
@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()));
QueryWrapper<BaseVehicleOutApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseVehicleOutApplyVo> listPageVo(PagerQuery<BaseVehicleOutApplyQuery> pq) {
BaseVehicleOutApplyQuery 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);
return p;
}
public void saveOrUpdateDto(BaseVehicleOutApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseVehicleOutApplyDto dto){
BaseVehicleOutApply entity = new BaseVehicleOutApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseVehicleOutApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseVehicleOutApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseVehicleOutApplyDetailsVo fetchDetailsVoBySid(String sid){
BaseVehicleOutApply entity = fetchBySid(sid);
BaseVehicleOutApplyDetailsVo vo = new BaseVehicleOutApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

2465
anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl

File diff suppressed because it is too large

3533
anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl

File diff suppressed because it is too large

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java

@ -68,5 +68,7 @@ public class FinCostapplyQuery implements Query {
private String applyStartDate;
@ApiModelProperty(value = "申请结束日期")
private String applyEndDate;
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@ -81,4 +81,9 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("应收未收款项sid")
private String receivablesSid;
@ApiModelProperty("全款贷款key:1是全款,2贷款")
private String payTypeKey;
@ApiModelProperty("全款贷款")
private String payType;
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java

@ -73,4 +73,9 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
private String reveivableMoney;
@ApiModelProperty("业务车辆sid")
private String busVinSid;
@ApiModelProperty("全款贷款key:1是全款,2贷款")
private String payTypeKey;
@ApiModelProperty("全款贷款")
private String payType;
}

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

@ -1584,11 +1584,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//贷款推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款","2");
//贷款推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2");
finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null));
if(finSelectedReceivablesDetailedVos1_1.size()>0){
}
//贷款推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2");
finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null));
if(finSelectedReceivablesDetailedVos2_1.size()>0){
}

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@ -133,6 +133,10 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
if (StringUtils.isNotBlank(pageQuery.getUserSid())) {
qw.eq("fc.createBySid", pageQuery.getUserSid());
}
//申请人的组织机构sid全路径
if(StringUtils.isNotBlank(pageQuery.getOrgPath())){
qw.eq("fc.orgSidPath",pageQuery.getOrgPath());
}
}
IPage<FinCostapply> page = PagerUtil.queryToPage(pq);
IPage<FinCostapplyVo> pagging = baseMapper.selectPageVo(page, qw);
@ -145,7 +149,12 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
//=======================================
String orgSidPath = dto.getOrgSidPath();
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
orgSidPath = dto.getOrgPath();
}else{
orgSidPath = dto.getOrgSidPath();
}
if(StringUtils.isBlank(orgSidPath)){
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@ -270,7 +279,6 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
}else{
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
// String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
FinCostapply finCostapply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, finCostapply);
if (r == 3) {

8
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -558,7 +558,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(StringUtils.isNotBlank(sysOrganizationVoResultBean.getData().getPsid())){
ResultBean<SysOrganizationVo> sysOrganizationVoResultBeanP = sysOrganizationFeign.fetchBySid(sysOrganizationVoResultBean.getData().getPsid());
if(sysOrganizationVoResultBeanP.getData() != null){
ogrName=sysOrganizationVoResultBean.getData().getName();
ogrName=sysOrganizationVoResultBeanP.getData().getName();
flowTask.setStartDeptName(ogrName+"-"+sysOrganizationVoResultBean.getData().getName());
}
}else{
@ -808,7 +808,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(StringUtils.isNotBlank(sysOrganizationVoResultBean.getData().getPsid())){
ResultBean<SysOrganizationVo> sysOrganizationVoResultBeanP = sysOrganizationFeign.fetchBySid(sysOrganizationVoResultBean.getData().getPsid());
if(sysOrganizationVoResultBeanP.getData() != null){
ogrName=sysOrganizationVoResultBean.getData().getName();
ogrName=sysOrganizationVoResultBeanP.getData().getName();
flowTask.setStartDeptName(ogrName+"-"+sysOrganizationVoResultBean.getData().getName());
}
}else{
@ -955,7 +955,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(StringUtils.isNotBlank(sysOrganizationVoResultBean.getData().getPsid())){
ResultBean<SysOrganizationVo> sysOrganizationVoResultBeanP = sysOrganizationFeign.fetchBySid(sysOrganizationVoResultBean.getData().getPsid());
if(sysOrganizationVoResultBeanP.getData() != null){
ogrName=sysOrganizationVoResultBean.getData().getName();
ogrName=sysOrganizationVoResultBeanP.getData().getName();
flowTask.setStartDeptName(ogrName+"-"+sysOrganizationVoResultBean.getData().getName());
}
}else{
@ -2040,7 +2040,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(StringUtils.isNotBlank(sysOrganizationVoResultBean.getData().getPsid())){
ResultBean<SysOrganizationVo> sysOrganizationVoResultBeanP = sysOrganizationFeign.fetchBySid(sysOrganizationVoResultBean.getData().getPsid());
if(sysOrganizationVoResultBeanP.getData() != null){
ogrName=sysOrganizationVoResultBean.getData().getName();
ogrName=sysOrganizationVoResultBeanP.getData().getName();
flowTask.setStartDeptName(ogrName+"-"+sysOrganizationVoResultBean.getData().getName());
}
}else{

20
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -2,11 +2,10 @@ package com.yxt.anrui.portal.biz.sysorganization;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.portal.api.sysorganization.*;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
@ -63,6 +62,7 @@ public class SysOrganizationRest implements SysOrganizationFeign {
private RedisUtil redisUtil;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private SysStaffinfoService sysStaffInfoService;
@Override
@ -232,10 +232,10 @@ public class SysOrganizationRest implements SysOrganizationFeign {
String zgNames = "";
String zgSids = "";
for (SysStaffOrgVo s : list) {
if ("1".equals(s.getManageType())) {
/*if ("1".equals(s.getManageType())) {
zgNames = zgNames + "," + s.getStaffName();
zgSids = zgSids + "," + s.getStaffSid();
}
}*/
if ("2".equals(s.getManageType())) {
fgNames = fgNames + "," + s.getStaffName();
fgSids = fgSids + "," + s.getStaffSid();
@ -245,16 +245,20 @@ public class SysOrganizationRest implements SysOrganizationFeign {
fgNames = fgNames.substring(1, fgNames.length());
fgSids = fgSids.substring(1, fgSids.length());
}
if (zgNames.length() > 1) {
/* if (zgNames.length() > 1) {
zgNames = zgNames.substring(1, zgNames.length());
zgSids = zgSids.substring(1, zgSids.length());
}
}*/
SysOrganizationVo vo = new SysOrganizationVo();
BeanUtil.copyProperties(entity, vo);
vo.setFgNames(fgNames);
vo.setFgStaffSid(fgSids);
vo.setZgNames(zgNames);
vo.setZgStaffSid(zgSids);
SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid());
if(sysUser != null){
vo.setZgStaffSid(sysUser.getStaffSid());
vo.setZgNames(entity.getManagerName());
}
return rb.success().setData(vo);
}

8
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -8,12 +8,11 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectQuery;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.portal.api.sysorganization.*;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
@ -295,6 +294,11 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
SysOrganization entity = this.fetchById(id);
SysOrganizationVo vo = new SysOrganizationVo();
BeanUtil.copyProperties(entity, vo);
SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid());
if(sysUser != null){
vo.setZgStaffSid(sysUser.getStaffSid());
vo.setZgNames(entity.getManagerName());
}
return vo;
}

Loading…
Cancel
Save