From 27f46fbfdcd0c5f5aa44c8c6093ab56dfd2728bd Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 14 Jan 2023 11:38:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=81=E7=94=9F=E6=88=90=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasePurchaseSystem.java | 3 +- .../BasePurchaseSystemDetailsVo.java | 3 +- .../BasePurchaseSystemDto.java | 3 +- .../BasePurchaseSystemVo.java | 3 +- .../api/basevehicleout/BaseVehicleOut.java | 2 + .../basevehicleout/BaseVehicleOutFeign.java | 2 +- .../BaseVehicleOutMaterial.java | 20 +- .../api/basevehicleout/BaseVehicleOutPdf.java | 19 - .../BaseVehicleOutApply.java | 94 + .../BaseVehicleOutApplyDetailsVo.java | 95 + .../BaseVehicleOutApplyDto.java | 95 + .../BaseVehicleOutApplyFeign.java | 78 + .../BaseVehicleOutApplyFeignFallback.java | 72 + .../BaseVehicleOutApplyQuery.java | 93 + .../BaseVehicleOutApplyVo.java | 95 + .../BasePurchaseSystemMapper.java | 2 +- .../BasePurchaseSystemService.java | 2 +- .../basevehicleout/BaseVehicleOutMapper.java | 4 + .../basevehicleout/BaseVehicleOutRest.java | 4 +- .../basevehicleout/BaseVehicleOutService.java | 221 +- .../BaseVehicleOutApplyMapper.java | 65 + .../BaseVehicleOutApplyMapper.xml | 13 + .../BaseVehicleOutApplyRest.java | 100 + .../BaseVehicleOutApplyService.java | 110 + .../src/main/resources/ftl/xsckd.ftl | 2465 ++++++++++++ .../src/main/resources/xsckd.ftl | 3533 ----------------- 26 files changed, 3530 insertions(+), 3666 deletions(-) delete mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVo.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl delete mode 100644 anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java index 6c068cbc2f..accf1e4c93 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java +++ b/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; // 财务中分公司编码 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java index 4c13bea73f..c718871171 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java +++ b/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; // 财务中分公司编码 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java index b1fa14753b..ffb3d9de7a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java +++ b/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; // 财务中分公司编码 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java index d18ad3f2c2..216556d0b8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java +++ b/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; // 财务中分公司编码 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index 7b417fd3a9..775f1bad60 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/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 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index 4d4e8b47c2..30bc788dd2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/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 createPdf(@RequestBody BaseVehicleOutPdf baseVehicleOutPdf); + ResultBean createPdf(@RequestParam("xsckdSid") String xsckdSid); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutMaterial.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutMaterial.java index 3efb493f9c..a9af31e691 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutMaterial.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java deleted file mode 100644 index 31fe7292d4..0000000000 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutPdf.java +++ /dev/null @@ -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; -} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java new file mode 100644 index 0000000000..496c198713 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApply.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply
+ * Description: 车辆出库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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; // 创建组织名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java new file mode 100644 index 0000000000..ffc1ab6024 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyVo.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo
+ * Description: 车辆出库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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; // 创建组织名称 + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java new file mode 100644 index 0000000000..6f05bd56ee --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyDto.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto
+ * Description: 车辆出库单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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; // 创建组织名称 +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java new file mode 100644 index 0000000000..2f76a20557 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyFeign.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign
+ * Description: 车辆出库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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> listPage(@RequestBody PagerQuery 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 fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java new file mode 100644 index 0000000000..c02f74e2a6 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeignFallback
+ * Description: 车辆出库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeign { + + @Override + public ResultBean> listPage(PagerQuery 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 fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basevehicleoutapply/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQuery.java new file mode 100644 index 0000000000..47b7762628 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyQuery.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery
+ * Description: 车辆出库单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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; // 创建组织名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVo.java new file mode 100644 index 0000000000..1fbaed192a --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyVo.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo
+ * Description: 车辆出库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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; // 创建组织名称 + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java index 84a87ae5c4..b7705c7a83 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java index 3b4dd67b34..09c5da621e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java +++ b/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 { int selectCountBySidVin(String vinSid); String selectNum(String billNo); + + @Select("select * from base_vehicle_out where mainSid = #{xsckdSid}") + List fetchByMainSid(String xsckdSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 03249e4a1a..24eb72661f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/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 createPdf(BaseVehicleOutPdf baseVehicleOutPdf) { + public ResultBean createPdf(String xsckdSid) { ResultBean rb = ResultBean.fireFail(); - PdfPath pdf = baseVehicleOutService.createPdf(baseVehicleOutPdf); + PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid); return rb.success().setData(pdf); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index e2a9886304..992408033e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/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 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 list = dto.getQueryList(); List stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList()); //根据sid查询出库的车辆是否符合出库条件（库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的，车辆才能出库、可以批量选择）、当选择的车辆不满足条件时，点击出库按钮时 @@ -103,9 +122,12 @@ public class BaseVehicleOutService extends MybatisBaseService 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 baseVehicleOuts = baseMapper.fetchByMainSid(xsckdSid); + //获取创建人姓名 + String createBySid = baseVehicleOutApply.getCreateBySid(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(createBySid).getData(); + String createByName = sysStaffinfoFeign.fetchBySid(sysUserVo.getStaffSid()).getData().getName(); Map dataMap = new HashMap(); //销售类型 - 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 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_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无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(销售出库单)
+ * File: BaseVehicleOutApplyMapper.java
+ * Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyMapper
+ * Description: 车辆出库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BaseVehicleOutApplyMapper extends BaseMapper { + + //@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_vehicle_out_apply") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml new file mode 100644 index 0000000000..0df014cd83 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java new file mode 100644 index 0000000000..da3cbcb284 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyRest
+ * Description: 车辆出库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @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> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java new file mode 100644 index 0000000000..ee93caec59 --- /dev/null +++ b/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(销售出库单)
+ * File: BaseVehicleOutApplyService.java
+ * Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService
+ * Description: 车辆出库单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BaseVehicleOutApplyService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BaseVehicleOutApplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseVehicleOutApplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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; + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl new file mode 100644 index 0000000000..c1bad983eb --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/xsckd.ftl @@ -0,0 +1,2465 @@ + + + + + God + 孟哲 + 2 + 0 + 2023-01-14T03:21:00Z + 2023-01-14T03:21:00Z + 1 + 55 + 319 + 2 + 1 + 373 + 16 + + + 2052-11.1.0.13703 + 454794E3066B4A5781390791ABB99E9B + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售出库单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${oName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售专员： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${sName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料分组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 成交价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 赠送套餐 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售折让 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mnum!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mgroup!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vtype!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.iunit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.sl!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.price!} + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flr!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.zstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.xszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zs!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${zcjj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zflje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zzstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${zxszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + ${makeDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核人： + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + ${confirmDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + + + + PAGE \* MERGEFORMAT + + + + + + 1 + + + + + + + + + + + + 页 + + + + + + + + + 共 + + + + + + + 1 + + + + + + + + + + 页 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl b/anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl deleted file mode 100644 index e50f656ce1..0000000000 --- a/anrui-base/anrui-base-biz/src/main/resources/xsckd.ftl +++ /dev/null @@ -1,3533 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售出库单 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售类型： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${saleType!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售日期： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${saleDate!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 单据编号： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${billNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 客户名称： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${cName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 电话： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${mobile!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售部门： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${oName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售专员： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${sName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 物料编码 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 物料分组 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 车辆类型 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 计量单位 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数量 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 成交价 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 返利人 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 返利金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 赠送套餐 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 销售折让 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 备注 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${mNum!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${mGroup!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${vehicleTypeValue!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${inventoryUnit!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${num!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${price!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${rebatePeo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${rebateMoney!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${complimentaryPackage!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${salesAllowance!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 合计 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tNum!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tPrice!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tRebateMoney!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tComplimentaryPackage!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tSalesAllowance!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 金额合计 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tPriceDX!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 制单人： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${makeListName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${makeListDate!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 审核人： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${confirmName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${confirmDate!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - 0 - 0 - 0 - 4 - false - false - 0 - WPS Office_11.1.0.13703_F1E327BC-269C-435d-A152-05C5408002CA - 0 - - - - - - - 2014-10-29T12:08:00Z - God - God - 2023-01-11T01:44:54Z - - - - - - - - 2052-11.1.0.13703 - - - B87E8B4FD1E740A8BF0EAF1644BE10BB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 7ed2893a29b39a915d5cbc4b64e8c34d0a738445 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 14 Jan 2023 14:08:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/VehicleCostListQuery.java | 2 ++ .../base/biz/basevehicle/BaseVehicleService.java | 10 ++++++++-- .../fin/api/fincostapply/FinCostapplyQuery.java | 2 ++ .../FinSelectedReceivablesDetailedDto.java | 5 +++++ .../DetailsOfReceivablesAndUncollectedItemsVo.java | 5 +++++ .../FinCollectionConfirmationService.java | 7 +++++-- .../fin/biz/fincostapply/FinCostapplyService.java | 12 ++++++++++-- .../biz/sysorganization/SysOrganizationRest.java | 3 +-- 8 files changed, 38 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleCostListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleCostListQuery.java index 356ef33bf6..886a331439 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleCostListQuery.java +++ b/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; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 575970e6e0..89d38d052a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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 qw = new QueryWrapper<>(); if (query != null) { - if (StringUtils.isNotBlank(query.getUserSid())) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()); + if(StringUtils.isNotBlank(query.getOrgPath())){ + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); qw.eq("bv.useOrgSid", resultBean.getData()); + }else{ + if (StringUtils.isNotBlank(query.getUserSid())) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()); + qw.eq("bv.useOrgSid", resultBean.getData()); + } } + if (query.getSidList().size() > 0) { qw.notIn("bv.vinNo", query.getSidList()); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java index c669c46dd4..d9569eb2a7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java +++ b/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; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index d07cf2f8a3..1fa7aff5dc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java +++ b/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; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java index fdcb9621ec..022dbeb3fc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java +++ b/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; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 563770deaf..4d173d988a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/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 finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款","2"); - //贷款推送订金 - List finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2"); + finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null)); if(finSelectedReceivablesDetailedVos1_1.size()>0){ + } + //贷款推送订金 + List finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2"); + finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null)); if(finSelectedReceivablesDetailedVos2_1.size()>0){ } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index 2be65d7f08..5cde45df7f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -145,7 +149,12 @@ public class FinCostapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -270,7 +279,6 @@ public class FinCostapplyService extends MybatisBaseService Date: Sat, 14 Jan 2023 14:51:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/biz/flowtask/FlowTaskService.java | 8 ++++---- .../sysorganization/SysOrganizationRest.java | 17 +++++++++++------ .../sysorganization/SysOrganizationService.java | 8 ++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 65da09e6ae..057cb61181 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/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 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 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 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 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{ diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index eec548f72f..0a863f61ce 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -5,6 +5,7 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; 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; @@ -231,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(); @@ -244,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); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 398448e8eb..568b2f8d63 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/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