Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java

@@ -60,5 +60,4 @@ public class BaseBrandletpricepowimit extends BaseEntity {
     private String useOrgName; // 分公司名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java

@@ -64,6 +64,8 @@ public class BaseBrandletpricepowimitDto implements Dto {
     private String useOrgName; // 分公司名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("事业部sid")
+    private String sybOrgSid; // 事业部sid
     @ApiModelProperty("角色让价权限")
     private List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits;
 }

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/6 17:13
+ * @Description
+ */
+@Data
+public class BasePurchSystemVo implements Vo {
+    private static final long serialVersionUID = -6059479664434626360L;
+    @ApiModelProperty("采购系统sid")
+    private String sid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+}

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

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystem.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表", description = "采购系统管理表")
+@TableName("base_purchase_system")
+public class BasePurchaseSystem extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

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

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo <br/>
+ * Description: 采购系统管理表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 视图数据详情", description = "采购系统管理表 视图数据详情")
+public class BasePurchaseSystemDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

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

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto <br/>
+ * Description: 采购系统管理表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 数据传输对象", description = "采购系统管理表 数据传输对象")
+public class BasePurchaseSystemDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

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

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystemFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购系统管理表")
+@FeignClient(
+        contextId = "anrui-base-BasePurchaseSystem",
+        name = "anrui-base",
+        path = "v1/basepurchasesystem",
+        fallback = BasePurchaseSystemFeignFallback.class)
+public interface BasePurchaseSystemFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(@RequestBody PagerQuery<BasePurchaseSystemQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BasePurchaseSystemDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据分公司sid查询采购系统名称")
+    @GetMapping("/fetchDetailsByUseOrgSid/{useOrgSid}")
+    @ResponseBody
+    public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
+
+    @ApiOperation("根据部门sid查询采购系统名称")
+    @GetMapping("/fetchDetailsByDeptSid/{deptSid}")
+    @ResponseBody
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(@PathVariable("deptSid") String deptSid);
+}

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

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeignFallback <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign {
+
+	@Override
+	public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(PagerQuery<BasePurchaseSystemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepurchasesystem/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BasePurchaseSystemDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepurchasesystem/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		return null;
+	}
+}

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

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery <br/>
+ * Description: 采购系统管理表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 查询条件", description = "采购系统管理表 查询条件")
+public class BasePurchaseSystemQuery implements Query {
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

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

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo <br/>
+ * Description: 采购系统管理表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 视图数据对象", description = "采购系统管理表 视图数据对象")
+public class BasePurchaseSystemVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java

@@ -86,7 +86,8 @@ public class BaseTrailerDto implements Dto {
 	private String useOrgSid;
 	@ApiModelProperty("分公司名称")
 	private String useOrgName;
-
+	@ApiModelProperty("部门sid")
+	private String departmentSid;
 	@ApiModelProperty("发票照片")
 	private List<CommonAppendixDto> invoicePic;
 	@ApiModelProperty("合格证照片")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java

@@ -51,8 +51,8 @@ public class BaseTrailerQuery implements Query {
 
 	@ApiModelProperty("挂车车架号")
 	private String vinNo;
-	@ApiModelProperty("车辆品牌sid")
-    private String carBrand; // 车辆品牌sid
+	@ApiModelProperty("车辆品牌名称")
+    private String carBrandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号")
 	private String carModelName; // 车辆型号
 	@ApiModelProperty("厂商sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java

@@ -50,8 +50,6 @@ import lombok.Data;
 public class BaseTrailerModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("车辆品牌sid")
-    private String brandSid; // 车辆品牌sid
 	@ApiModelProperty("车辆品牌名称")
     private String brandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java

@@ -51,8 +51,6 @@ public class BaseTrailerModelDetailsVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("车辆品牌sid")
-    private String brandSid; // 车辆品牌sid
 	@ApiModelProperty("车辆品牌名称")
     private String brandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java

@@ -51,8 +51,6 @@ public class BaseTrailerModelDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("车辆品牌sid")
-    private String brandSid; // 车辆品牌sid
 	@ApiModelProperty("车辆品牌名称")
     private String brandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java

@@ -49,8 +49,8 @@ import lombok.Data;
 @ApiModel(value = "挂车车型表 查询条件", description = "挂车车型表 查询条件")
 public class BaseTrailerModelQuery implements Query {
 
-	@ApiModelProperty("车辆品牌sid")
-    private String brandSid; // 车辆品牌sid
+	@ApiModelProperty("车辆品牌名称")
+    private String brandName; // 车辆品牌名称
     @ApiModelProperty("车辆型号名称")
     private String carModelName; // 车辆型号名称
 	@ApiModelProperty("厂商sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java

@@ -51,8 +51,6 @@ public class BaseTrailerModelVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("车辆品牌sid")
-    private String brandSid; // 车辆品牌sid
 	@ApiModelProperty("车辆品牌名称")
     private String brandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号sid")

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -476,4 +477,8 @@ public interface BaseVehicleFeign {
     @ResponseBody
     public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(@RequestBody PagerQuery<InputVinListQuery> query);
 
+    @ApiOperation("根据车辆sid获取采购系统信息")
+    @GetMapping("/getSystem")
+    @ResponseBody
+    ResultBean<BasePurchSystemVo> getSystem(@RequestParam("sid")String sid);
 }

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -381,6 +382,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getSystem(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

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

@@ -239,4 +239,13 @@ public class BaseVehicleVo implements Vo {
     private String carModel;
     @ApiModelProperty(value = "细分市场")
     private String marketSegmentsValue;
+
+    @ApiModelProperty("上装/挂车")
+    private String szOrGC;
+    @ApiModelProperty("上装/挂车配置")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

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

@@ -81,4 +81,11 @@ public class BaseVehicleOut extends BaseEntity {
     private String middleCodeTwo;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

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

@@ -60,4 +60,11 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String saleDate;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

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

@@ -70,6 +70,13 @@ public class BaseVehicleOutDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
+
     @ApiModelProperty("是否要修改客户")
     private String isUpdateOrInsertCrm; // 是否要修改客户
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java

@@ -81,5 +81,6 @@ public class BaseVehinstallDto implements Dto {
     private String useOrgSid; // 使用组织
 	@ApiModelProperty("创建组织")
     private String createOrg; // 创建组织
-
+    @ApiModelProperty("部门sid")
+    private String departmentSid; // 部门sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.busvehicleorder;
 
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -122,4 +123,9 @@ public interface BusVehicleOrderFeign {
     @PutMapping("/updateState")
     ResultBean updateLockNum(@RequestParam("sid")String sid,@RequestParam("num")String num);
 
+    @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段")
+    @GetMapping("/getDetails")
+    @ResponseBody
+    ResultBean<BasePurchSystemVo> getDetails(@RequestParam("sid")String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.busvehicleorder;
 
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -117,5 +118,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getDetails(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java

@@ -15,7 +15,7 @@ public enum ContractTemplateEnum {
     CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"),
     VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"),
     ENTRUSTPICKUPAUTHORIZATION("entrust_pickup_authorization", "委托提车授权书"),
-    CONTRACTALL("contract_all", "合同其他附件"),
+    CONTRACTALL("contract_all", "合同整体"),
     ;
 
     /**

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java

@@ -17,7 +17,7 @@ public class InvoicMessageContractVo implements Vo {
     @ApiModelProperty("开票类型")
     private String type;
     @ApiModelProperty("开票金额")
-    private String invoicMoney;
+    private String money;
     @ApiModelProperty("开票名称")
-    private String invoicName;
+    private String name;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -21,6 +21,7 @@ public enum BillTypeEnum {
     JYDDCLYD("JYDDCLYD","简易订单车辆预定"),
     XSDDHT("XSDDHT","销售订单合同"),
     XSDD("XSDD","销售订单"),
+    SKD("SKD","款项确认"),
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java

@@ -110,6 +110,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("useOrgSid", query.getUseOrgSid());
         }
+        qw.eq("createOrgSid", sybOrgSid);
         IPage<BaseBrandletpricepowimit> page = PagerUtil.queryToPage(pq);
         IPage<BaseBrandletpricepowimitVo> pagging = baseMapper.selectPageVo(page, qw);
         for (BaseBrandletpricepowimitVo record : pagging.getRecords()) {
@@ -122,7 +123,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
                     String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice();
                     roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
                 }
-                record.setRoleLetPrice(roleLetPrice.substring(0,roleLetPrice.lastIndexOf("、")));
+                record.setRoleLetPrice(roleLetPrice.substring(0, roleLetPrice.lastIndexOf("、")));
             }
         }
         PagerVo<BaseBrandletpricepowimitVo> p = PagerUtil.pageToVo(pagging, null);
@@ -184,8 +185,8 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         String brandSid = query.getBrandSid();
         String orgSid = query.getOrgSid();
         String roleSid = query.getRoleSid();
-        String money = baseMapper.getMoney(brandSid,orgSid,roleSid);
-        if(StringUtils.isBlank(money)){
+        String money = baseMapper.getMoney(brandSid, orgSid, roleSid);
+        if (StringUtils.isBlank(money)) {
             return rb;
         }
         return rb.success().setData(money);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -564,8 +564,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
-                ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
+                messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
+                messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -665,8 +665,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(ufVo, messageFlowVo);
-            ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
-            ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
+            messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
+            messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -720,8 +720,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(ufVo, messageFlowVo);
-            ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
-            ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
+            messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
+            messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -795,16 +795,18 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = baseInternalPurchase.getProcInstId();
-                ufVo.setProcInsId(procId);
-                ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("分公司间调车申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -356,8 +356,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcInsId(baseModelModprice.getProcInstId());
-                ufVo.setProcDefId(baseModelModprice.getProcDefId());
+                messageFlowVo.setProcInsId(baseModelModprice.getProcInstId());
+                messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -428,16 +428,18 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = baseModelModprice.getProcInstId();
-                ufVo.setProcInsId(procId);
-                ufVo.setProcDefId(baseModelModprice.getProcDefId());
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
                 messageFlowableQuery.setModuleName("车型调价申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

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

@@ -37,14 +37,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
-import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
@@ -495,7 +493,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(uff, messageFlowVo);
-            uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+            messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
@@ -503,7 +501,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return resultBean1;
         } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
@@ -519,8 +516,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(uff, messageFlowVo);
-            uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
-            uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
+            messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+            messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
@@ -528,7 +525,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return rb;
         } else {
@@ -612,7 +608,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(uff, messageFlowVo);
-                uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+                messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -815,15 +811,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(data, messageFlowVo);
             String procId = baseOutsourcingApplication.getProcInstSid();
-            data.setProcInsId(procId);
+            messageFlowVo.setProcInsId(procId);
+            messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
             messageFlowableQuery.setModuleName("外采申请");
             ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
             String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+            String nextName = listResultBean.getData().get(0).getName_();
             List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-            if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
+//            if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
+            if ("发起申请".equals(nextName)) {
                 messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
             } else {
                 messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@@ -831,7 +830,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(data, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return resultBean;
         } else {

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

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem> {
+
+	//@Update("update base_purchase_system set name=#{msg} where id=#{id}")
+	//IPage<BasePurchaseSystemVo> voPage(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) QueryWrapper<BasePurchaseSystem> qw);
+	
+	IPage<BasePurchaseSystemVo> selectPageVo(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
+	
+	List<BasePurchaseSystemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
+	
+	@Select("select * from base_purchase_system")
+	List<BasePurchaseSystemVo> selectListVo();
+
+	@Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}")
+	List<BasePurchaseSystemDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid);
+
+	@Select("select * from base_purchase_system where deptSid = #{deptSid}")
+	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);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.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.basepurchasesystem.BasePurchaseSystemMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
+		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
+		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+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.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购系统管理表")
+@RestController("com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest")
+@RequestMapping("v1/basepurchasesystem")
+public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
+
+	@Autowired
+	private BasePurchaseSystemService basePurchaseSystemService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(@RequestBody PagerQuery<BasePurchaseSystemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BasePurchaseSystemVo> pv = basePurchaseSystemService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BasePurchaseSystemDto dto){
+		return basePurchaseSystemService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		basePurchaseSystemService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);
+	}
+}

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

@@ -0,0 +1,143 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
+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.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService <br/>
+ * Description: 采购系统管理表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSystemMapper, BasePurchaseSystem> {
+	private QueryWrapper<BasePurchaseSystem> createQueryWrapper(BasePurchaseSystemQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BasePurchaseSystemVo> listPageVo(PagerQuery<BasePurchaseSystemQuery> pq) {
+		BasePurchaseSystemQuery query = pq.getParams();
+		QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getUseOrgSid())){
+			qw.eq("useOrgSid",query.getUseOrgSid());
+		}
+		if (StringUtils.isNotBlank(query.getPurchaseSystemName())){
+			qw.like("purchaseSystemName",query.getPurchaseSystemName());
+		}
+		IPage<BasePurchaseSystem> page = PagerUtil.queryToPage(pq);
+		IPage<BasePurchaseSystemVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BasePurchaseSystemVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto){
+		ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+			BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid());
+			if (basePurchaseSystemDetailsVo == null){
+				this.insertByDto(dto);
+				return rb.success().setMsg("添加成功");
+			}
+            return rb.setMsg("该部门下已存在采购系统，请重新选择");
+        }
+		BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid);
+		if (basePurchaseSystem == null){
+			return rb.setMsg("该采购系统信息不存在");
+		}
+		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid(), dtoSid);
+		if (basePurchaseSystemDetailsVo == null){
+			this.updateByDto(dto);
+			return rb.success().setMsg("修改成功");
+		}
+		return rb.setMsg("该部门下已存在采购系统，请重新选择");
+	}
+	
+	public void insertByDto(BasePurchaseSystemDto dto){
+		BasePurchaseSystem entity = new BasePurchaseSystem();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BasePurchaseSystemDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BasePurchaseSystem entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid){
+		BasePurchaseSystem entity = fetchBySid(sid);
+		BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<BasePurchaseSystemDetailsVo> basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid);
+		return rb.success().setData(basePurchaseSystemDetailsVos);
+	}
+
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		ResultBean rb = ResultBean.fireFail();
+		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
+		return rb.success().setData(basePurchaseSystemDetailsVo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -81,4 +81,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
      * @return
      */
     IPage<BaseTrailerSearchVo> searchPage(IPage<BaseTrailerSearchVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseTrailerSearchVo> qw);
+
+    @Select("select * from base_trailer where vehSid = #{sid}")
+    BaseTrailerDetailsVo fetchByVehSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -26,18 +26,24 @@
 package com.yxt.anrui.base.biz.basetrailer;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basetrailer.*;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
@@ -46,6 +52,12 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -56,6 +68,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -90,16 +103,24 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
+    @Resource
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BaseManufacturerService baseManufacturerService;
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
 
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseTrailer> qw = new QueryWrapper<>();
-        qw.eq("bt.useOrgSid",query.getUseOrgSid());
+        qw.eq("bt.useOrgSid", query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("bt.vinNo", query.getVinNo());
         }
-        if (StringUtils.isNotBlank(query.getCarBrand())) {
-            qw.eq("btm.brandSid", query.getCarBrand());
+        if (StringUtils.isNotBlank(query.getCarBrandName())) {
+            qw.eq("btm.brandName", query.getCarBrandName());
         }
         if (StringUtils.isNotBlank(query.getSettlementSid())) {
             qw.eq("btm.manufacturerSid", query.getSettlementSid());
@@ -165,7 +186,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
             String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
             BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
-            if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")){
+            if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
                 baseTrailerDetailsVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
                 baseTrailerDetailsVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
                 break;
@@ -175,13 +196,13 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         List<CommonAppendixVo> invoicePic = new ArrayList<>();
         List<CommonAppendixVo> certificatePic = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-            if (commonAppendixVo.getAttachType().equals("挂车发票照片")){
+            if (commonAppendixVo.getAttachType().equals("挂车发票照片")) {
                 String filePath = commonAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 filePath = urlPrefix + filePath;
                 commonAppendixVo.setFilePath(filePath);
                 invoicePic.add(commonAppendixVo);
-            }else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+            } else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
                 String filePath = commonAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 filePath = urlPrefix + filePath;
@@ -242,6 +263,52 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             certificatePic.setAttachType("挂车合格证照片");
             commonAppendixService.saveOrUpdateDto(certificatePic);
         }
+        StkInStock stkInStock = new StkInStock();
+        //入库日期:FDate  (必填项)
+        stkInStock.setFDate(DateUtil.now());
+        //采购部门:FPurchaseDeptId  (必填项)
+        String departmentSid = dto.getDepartmentSid();
+        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
+        stkInStock.setFPurchaseDeptId(data.getOrgCode());
+        //采购组织:FPurchaseOrgId  (必填项)
+        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
+        SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
+        if (vo != null) {
+            stkInStock.setFPurchaseOrgId(vo.getOrgCode());
+            //分配目标组织:TOrgId  (必填项)
+            stkInStock.setTOrgId(vo.getOrgCode());
+        }
+        //供应商:FSupplierId  (必填项)
+        String trailerModelSid = baseTrailer.getTrailerModelSid();
+        BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid);
+        BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseTrailerModel.getManufacturerSid());
+        stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
+        //物料列表:FInStockEntry  (必填项)
+        List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
+        StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+        //单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
+        sf.setFPrice(baseTrailer.getSettlementPrice().toString());
+        //车辆类型
+        sf.setCllx("61");
+        sf.setCllxType("sellChannel");
+        //批号:FLot
+        sf.setFLot(baseTrailer.getVinNo());
+        //物料编码:FMaterialId  (必填项)
+        sf.setFMaterialId(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
+        //仓库:FStockId
+        sf.setFStockId("ARZSCK");
+        //物料分组
+        sf.setWlfz("99.02");
+        //存货类别
+        sf.setFCategoryIDKey("005");
+        sf.setFCategoryIDType("purchaseOrderType");
+        fInStockEntry.add(sf);
+        stkInStock.setFInStockEntry(fInStockEntry);
+        try {
+            finKingDeeFeign.draftStkInStock(stkInStock);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return rb.success().setMsg("保存成功");
     }
 
@@ -315,4 +382,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
         return qw;
     }
+
+    public BaseTrailerDetailsVo fetchByVehSid(String sid) {
+        return baseMapper.fetchByVehSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java

@@ -71,8 +71,8 @@ public class BaseTrailerModelService extends MybatisBaseService<BaseTrailerModel
 		BaseTrailerModelQuery query = pq.getParams();
 		QueryWrapper<BaseTrailerModel> qw = new QueryWrapper<>();
 		qw.eq("useOrgSid",query.getUseOrgSid());
-		if (StringUtils.isNotBlank(query.getBrandSid())){
-			qw.eq("brandSid",query.getBrandSid());
+		if (StringUtils.isNotBlank(query.getBrandName())){
+			qw.eq("brandName",query.getBrandName());
 		}
 		if (StringUtils.isNotBlank(query.getCarModelName())){
 			qw.like("carModelName",query.getCarModelName());

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -486,4 +488,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     AppBaseConfigOrderCarVo getStockModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     String selectByfMaterialID(String fMaterialID);
+
+
+    BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1557,4 +1557,8 @@
         WHERE vinNo like concat('%', #{fMaterialID}, '%')
         LIMIT 1
     </select>
+
+    <select id="getSystem" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
+        select purchaseSystemName,sid from base_purchase_system where useOrgSid = #{useOrgSid} and deptSid = #{purchaseSystemSid}
+    </select>
 </mapper>

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

@@ -10,20 +10,29 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationService;
+import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
+import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
+import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
+import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.CertificState;
@@ -124,6 +133,14 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     private BaseManufacturerBankService baseManufacturerBankService;
     @Autowired
     private ScmWarehouseFeign scmWarehouseFeign;
+    @Autowired
+    private BaseTrailerService baseTrailerService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
+    @Autowired
+    private BaseTrailerModelService baseTrailerModelService;
+    @Autowired
+    private BaseVehinstallmodelService baseVehinstallmodelService;
 
     @Override
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
@@ -194,6 +211,33 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             String createOrgSid = record.getCreateOrgSid();
             BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
             record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
+            String sid = record.getSid();
+            BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(sid);
+            BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(vinNo, createOrgSid);
+            if (baseTrailerDetailsVo != null){
+                BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailerDetailsVo.getTrailerModelSid());
+                String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
+                String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
+                String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
+                String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
+                String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
+                StringBuilder trailerModel = new StringBuilder();
+                trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
+                record.setSzOrGC("挂车");
+                record.setTrailerOrInstall(trailerModel.toString());
+                record.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice());
+            }else if (baseVehinstallDetailsVo != null){
+                BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstallDetailsVo.getMainSid());
+                String wk_long = baseVehinstallmodel.getWk_long();
+                String wk_wide = baseVehinstallmodel.getWk_wide();
+                String wk_high = baseVehinstallmodel.getWk_high();
+                String installName = baseVehinstallmodel.getInstallNameValue();
+                StringBuilder vehinstallmodel = new StringBuilder();
+                vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
+                record.setSzOrGC("上装");
+                record.setTrailerOrInstall(vehinstallmodel.toString());
+                record.setTrailerOrInstallDealPrice(baseVehinstallDetailsVo.getGuidePrice());
+            }
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);
@@ -1255,6 +1299,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getSystem(String sid) {
+        return baseVehicleService.getSystem(sid);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

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

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
@@ -3547,4 +3548,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public String selectByfMaterialID(String fMaterialID) {
         return baseMapper.selectByfMaterialID(fMaterialID);
     }
+
+    public ResultBean<BasePurchSystemVo> getSystem(String sid) {
+        ResultBean<BasePurchSystemVo> rb = ResultBean.fireFail();
+        BaseVehicle baseVehicle = fetchBySid(sid);
+        BasePurchSystemVo basePurchSystemVo = baseMapper.getSystem(baseVehicle.getUseOrgSid(),baseVehicle.getPurchaseSystemSid());
+        return rb.success().setData(basePurchSystemVo);
+    }
 }

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

@@ -152,7 +152,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             //新增
             //=======================================
             String orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
-            if(StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())){
+            if (StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())) {
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid());
                 if (!userVoResultBean.getSuccess()) {
@@ -192,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales,"orgSidPath");
+            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "orgSidPath");
             int i = baseMapper.updateById(baseVehicleActualSales);
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);
@@ -316,17 +316,17 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         if (dto.getDetailsList().size() == 0) {
             return rb.setMsg("请选择未售买断的车辆");
-        }else{
+        } else {
             List<BaseVehicleActualDetailsDto> busVehicleApplyDetailList = dto.getDetailsList();
             busVehicleApplyDetailList.removeAll(Collections.singleton(null));
             List<String> stringList = new ArrayList<>();
             if (!busVehicleApplyDetailList.isEmpty()) {
                 for (BaseVehicleActualDetailsDto d : busVehicleApplyDetailList) {
-                   String vinNo = d.getVinNo();
+                    String vinNo = d.getVinNo();
                     //根据车型查询品牌是否一致
                     BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(vinNo, useOrgSid);
                     String brandSid = baseVehicle.getCarBrandSid();
-                    if(!dto.getCarBrandSid().equals(brandSid)){
+                    if (!dto.getCarBrandSid().equals(brandSid)) {
                         return rb.setMsg("选择的车辆的品牌与选择的品牌不一致");
                     }
                     stringList.add(brandSid);
@@ -497,8 +497,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
-                ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
+                messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
+                messageFlowVo.setProcInsId(baseVehicleActualSales.getProcInstId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@@ -623,16 +623,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = baseVehicleActualSales.getProcInstId();
-                ufVo.setProcInsId(procId);
-                ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
                 messageFlowableQuery.setModuleName("未售买断申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
+                if ("未售买断申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                     //更新未售买断状态为未买断
                     //更新车辆状态为未买断
@@ -675,12 +677,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-                if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
+                baseVehicleActualSales = fetchBySid(query.getBusinessSid());
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(baseVehicleActualSales.getProcInstId());
+                String nextName = listResultBean.getData().get(0).getName_();
+                if ("未售买断申请".equals(nextName)) {
                     //更新车辆状态为未买断
                     String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
                     String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
                     updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
                 }
+                /*if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
+                    //更新车辆状态为未买断
+                    String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                    String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                    updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
+                }*/
                 return rb.success().setData(resultBean.getData());
             }
         }

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

@@ -5,11 +5,20 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.*;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
 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.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -57,6 +66,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
     private SysStaffinfoFeign sysStaffinfoFeign;
+    @Autowired
+    private BaseTrailerService baseTrailerService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -70,43 +87,69 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             String vinNo = String.join(",", count);
             return rb.setMsg(vinNo + "车辆不满足出库条件");
         }*/
-
-        String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-        Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
-        if (!aBoolean){
-            Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
-            if (!aBoolean1){
+        String vinSid = dto.getVinSid();
+        BdCustomer bdCustomer = new BdCustomer();
+        String payTypeKey = "";
+        SysOrganizationVo sysOrganizationVo = null;
+        //判断车辆是否存在流程中的销售订单
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
+            BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
+            if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
+                payTypeKey = busSalesOrderDetailsVo.getPayTypeKey();
+                break;
+            }
+        }
+        //取付款方式是否为全款（1全款）
+        if ("1".equals(payTypeKey)) {
+            Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+            if (!aBoolean) {
                 List<BdCustomer> bdCustomers = new ArrayList<>();
-                BdCustomer bdCustomer = new BdCustomer();
-                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
                 bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
-                String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-                if (FNumber1.length() > 30){
-                    FNumber1 = FNumber1.substring(0,30);
-                    bdCustomer.setFNumber(FNumber1);
-                }else {
-                    bdCustomer.setFNumber(FNumber1);
-                }
-                bdCustomer.setFShortName(dto.getConcatNo());
+                bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
+                bdCustomer.setFNumber(dto.getCustomerNo());
+                //bdCustomer.setFShortName(dto.getConcatNo());
                 bdCustomers.add(bdCustomer);
                 finKingDeeFeign.draftBdCustomers(bdCustomers);
-            }else {
-                b = true;
-                return rb.success().setData(b);
             }
+        } else {
+            String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+            Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
+            if (!aBoolean) {
+                Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                if (!aBoolean1) {
+                    List<BdCustomer> bdCustomers = new ArrayList<>();
+                    sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                    bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                    bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+                    String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                    if (FNumber1.length() > 30) {
+                        FNumber1 = FNumber1.substring(0, 30);
+                        bdCustomer.setFNumber(FNumber1);
+                    } else {
+                        bdCustomer.setFNumber(FNumber1);
+                    }
+                    bdCustomer.setFShortName(dto.getConcatNo());
+                    bdCustomers.add(bdCustomer);
+                    finKingDeeFeign.draftBdCustomers(bdCustomers);
+                } else {
+                    b = true;
+                    return rb.success().setData(b);
+                }
+            }
+            //修改客户简称为合同编号
+            List<BdCustomer> bdCustomers = new ArrayList<>();
+            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+            bdCustomer.setFShortName(dto.getConcatNo());
+            bdCustomer.setFNumber(FNumber);
+            bdCustomer.setOldFNumber(FNumber);
+            sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.saveBdCustomers(bdCustomers);
         }
-        //修改客户简称为合同编号
-        List<BdCustomer> bdCustomers = new ArrayList<>();
-        BdCustomer bdCustomer = new BdCustomer();
-        bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
-        bdCustomer.setFShortName(dto.getConcatNo());
-        bdCustomer.setFNumber(FNumber);
-        bdCustomer.setOldFNumber(FNumber);
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
-        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-        bdCustomers.add(bdCustomer);
-        finKingDeeFeign.saveBdCustomers(bdCustomers);
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -151,12 +194,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //推送财务中介人
             if (StringUtils.isNotBlank(dto.getMiddleOne())) {
                 BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
-                ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
+                finKingDeeFeign.draftBdCustomer(bdMiddle);
             }
             //创建出库单数据对象前 需要将客户的编码修改为新生成的客户的编码。
-            dto.setCustomerNo(bdCustomer.getFNumber());
+            if (StringUtils.isNotBlank(bdCustomer.getFNumber())){
+                dto.setCustomerNo(bdCustomer.getFNumber());
+            }
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
-            ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
+            finKingDeeFeign.draftSalOutStock(salOutStock);
             //推送销售专员信息
             BDEmpinfo bdEmpinfo = new BDEmpinfo();
             String staffSid = dto.getStaffSid();
@@ -171,21 +216,221 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         } catch (Exception e) {
             log.error(e.getMessage());
         }
-
+        //推送金蝶上装/挂车销售出库单
+        String trailerOrInstall = dto.getTrailerOrInstall();
+        if (StringUtils.isNotBlank(trailerOrInstall)){
+            SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
+            finKingDeeFeign.draftSalOutStock(salOutStock);
+        }
         return rb.success();
     }
 
+    private SalOutStock createSzOrGcSalOutStock(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
+        SalOutStock salOutStock = new SalOutStock();
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(baseVehicle.getSid());
+        BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicle.getVinNo(), baseVehicle.getCreateOrgSid());
+        if (baseTrailerDetailsVo != null) {
+            //日期
+            salOutStock.setFDate(DateUtil.today());
+            //分公司id
+            salOutStock.setFSaleOrgId(baseVehicle.getOrgCode());
+            //客户
+            salOutStock.setFCustomerID(dto.getCustomerNo());
+            //销售部门id
+            String orgDeptSid = dto.getOrgSid();
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo = resultBean.getData();
+                if (vo != null) {
+                    salOutStock.setFSaleDeptID(vo.getOrgCode());
+                }
+            }
+            //项目类别key和项目类别type
+            salOutStock.setF_PAEZ_AssistantType("payType");
+            salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+            //中介单位
+            salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
+            //物料列表
+            List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
+            SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
+            //单价
+            fEntity.setFPrice(baseTrailerDetailsVo.getDealPrice());
+            //物料编码
+            fEntity.setFMaterialID(baseTrailerDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "G");
+            //仓库id
+            fEntity.setFStockID(baseVehicle.getLocationCode());
+            //销售折让
+            if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+                fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
+            }
+            if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
+                fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
+            }
+            //返利金额
+            fEntity.setF_PAEZ_Decimal("0");
+            String remarks = dto.getRemarks();
+            String note = "";
+            if (StringUtils.isNotBlank(remarks)) {
+                note = note + remarks;
+            }
+            //备注
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
+                        } else {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+//                        fEntity.setFEntrynote(note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。");
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                        }
+
+                    } else {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
+                        }
+                    }
+
+                } else {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+
+            }
+            if (StringUtils.isNotBlank(note)) {
+                fEntity.setFEntrynote(note);
+            }
+            fEntityList.add(fEntity);
+            if (fEntityList.size() > 0) {
+                salOutStock.setFEntity(fEntityList);
+                return salOutStock;
+            } else {
+                return null;
+            }
+        } else if (baseVehinstallDetailsVo != null) {
+            //日期
+            salOutStock.setFDate(DateUtil.today());
+            //分公司id
+            salOutStock.setFSaleOrgId(baseVehicle.getOrgCode());
+            //客户
+            salOutStock.setFCustomerID(dto.getCustomerNo());
+            //销售部门id
+            String orgDeptSid = dto.getOrgSid();
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo = resultBean.getData();
+                if (vo != null) {
+                    salOutStock.setFSaleDeptID(vo.getOrgCode());
+                }
+            }
+            //项目类别key和项目类别type
+            salOutStock.setF_PAEZ_AssistantType("payType");
+            salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+            //中介单位
+            salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
+            //物料列表
+            List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
+            SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
+            //单价
+            fEntity.setFPrice(baseVehinstallDetailsVo.getCostPrice());
+            //物料编码
+            fEntity.setFMaterialID(baseVehinstallDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
+            //仓库id
+            fEntity.setFStockID(baseVehicle.getLocationCode());
+            //销售折让
+            if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+                fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
+            }
+            if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
+                fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
+            }
+            //返利金额
+            fEntity.setF_PAEZ_Decimal("0");
+            String remarks = dto.getRemarks();
+            String note = "";
+            if (StringUtils.isNotBlank(remarks)) {
+                note = note + remarks;
+            }
+            //备注
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
+                        } else {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                        }
+
+                    } else {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
+                        }
+                    }
+
+                } else {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+
+            }
+            if (StringUtils.isNotBlank(note)) {
+                fEntity.setFEntrynote(note);
+            }
+            fEntityList.add(fEntity);
+            if (fEntityList.size() > 0) {
+                salOutStock.setFEntity(fEntityList);
+                return salOutStock;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
     public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm();
         List<BdCustomer> bdCustomers = new ArrayList<>();
         BdCustomer bdCustomer = new BdCustomer();
-        if ("是".equals(isUpdateOrInsertCrm)){
+        if ("是".equals(isUpdateOrInsertCrm)) {
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-            if (FNumber.length() > 30){
-                FNumber = FNumber.substring(0,30);
+            if (FNumber.length() > 30) {
+                FNumber = FNumber.substring(0, 30);
                 bdCustomer.setFNumber(FNumber);
-            }else {
+            } else {
                 bdCustomer.setFNumber(FNumber);
             }
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
@@ -195,15 +440,15 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdCustomer.setFShortName(dto.getConcatNo());
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.saveBdCustomers(bdCustomers);
-        }else if ("否".equals(isUpdateOrInsertCrm)){
+        } else if ("否".equals(isUpdateOrInsertCrm)) {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
             bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
+            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-            if (FNumber1.length() > 30){
-                FNumber1 = FNumber1.substring(0,30);
+            if (FNumber1.length() > 30) {
+                FNumber1 = FNumber1.substring(0, 30);
                 bdCustomer.setFNumber(FNumber1);
-            }else {
+            } else {
                 bdCustomer.setFNumber(FNumber1);
             }
             bdCustomer.setFShortName(dto.getConcatNo());
@@ -488,8 +733,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getInsideCode())) {
                 qw.like("bv.insideCode", params.getInsideCode());
             }
-            if (StringUtils.isNotBlank(params.getOrgSid())){
-                qw.eq("bvo.createOrgSid",params.getOrgSid());
+            if (StringUtils.isNotBlank(params.getOrgSid())) {
+                qw.eq("bvo.createOrgSid", params.getOrgSid());
             }
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -64,4 +65,7 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 	List<String> selectListVo(String createOrgSid);
 
     List<BaseVehinstall> selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin);
+
+	@Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
+    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -25,6 +25,18 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.basevehinstall;
 
+import cn.hutool.core.date.DateUtil;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
+import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,6 +46,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
@@ -42,6 +55,8 @@ import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
 
+import javax.annotation.Resource;
+
 /**
  * Project: anrui-base(上装配置管理) <br/>
  * File: BaseVehinstallFeignFallback.java <br/>
@@ -62,6 +77,14 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 
 	@Autowired
 	private BaseVehinstallService baseVehinstallService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private BaseVehinstallmodelService baseVehinstallmodelService;
+	@Autowired
+	private BaseManufacturerService baseManufacturerService;
+	@Resource
+	private FinKingDeeFeign finKingDeeFeign;
 
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
@@ -97,6 +120,54 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 			return rb.setMsg("请填写销售指导价");
 		}
 		baseVehinstallService.saveOrUpdateDto(dto);
+		if (StringUtils.isBlank(dto.getSid())){
+			StkInStock stkInStock = new StkInStock();
+			//入库日期:FDate  (必填项)
+			stkInStock.setFDate(DateUtil.now());
+			//采购部门:FPurchaseDeptId  (必填项)
+			String departmentSid = dto.getDepartmentSid();
+			SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
+			stkInStock.setFPurchaseDeptId(data.getOrgCode());
+			//采购组织:FPurchaseOrgId  (必填项)
+			ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
+			SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
+			if (vo != null) {
+				stkInStock.setFPurchaseOrgId(vo.getOrgCode());
+				//分配目标组织:TOrgId  (必填项)
+				stkInStock.setTOrgId(vo.getOrgCode());
+			}
+			//供应商:FSupplierId  (必填项)
+			String mainSid = dto.getMainSid();
+			BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
+			BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid());
+			stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
+			//物料列表:FInStockEntry  (必填项)
+			List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
+			StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+			//单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
+			sf.setFPrice(dto.getCostPrice());
+			//车辆类型
+			sf.setCllx("61");
+			sf.setCllxType("sellChannel");
+			//批号:FLot
+			sf.setFLot(dto.getVinNo());
+			//物料编码:FMaterialId  (必填项)
+			sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
+			//仓库:FStockId
+			sf.setFStockId("ARZSCK");
+			//物料分组
+			sf.setWlfz("99.02");
+			//存货类别
+			sf.setFCategoryIDKey("005");
+			sf.setFCategoryIDType("purchaseOrderType");
+			fInStockEntry.add(sf);
+			stkInStock.setFInStockEntry(fInStockEntry);
+			try {
+				finKingDeeFeign.draftStkInStock(stkInStock);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 		return rb.success();
 	}
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -213,4 +213,8 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 	public List<BaseVehinstall> selectByOrgSidAndVin(String orgSid, String vin) {
 		return baseMapper.selectByOrgSidAndVin(orgSid,vin);
 	}
+
+	public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) {
+		return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid);
+	}
 }

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

@@ -611,8 +611,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcDefId(busVehicleApply.getProcDefId());
-                ufVo.setProcInsId(busVehicleApply.getProcInstId());
+                messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
+                messageFlowVo.setProcInsId(busVehicleApply.getProcInstId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
@@ -725,16 +725,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = busVehicleApply.getProcInstId();
-                ufVo.setProcInsId(procId);
-                ufVo.setProcDefId(busVehicleApply.getProcDefId());
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("厂家采购申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextName = listResultBean.getData().get(0).getName_();
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java

@@ -30,9 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleorder.*;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -119,4 +120,8 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
     void updateState(String vehicleOrderSid);
 
     int updateLockNum(@Param("sid") String sid, @Param("num") String num);
+
+    BasePurchSystemVo getDetails(@Param("createOrgSid") String createOrgSid,@Param("deptSid") String deptSid);
+
+    BusVehicleApply selectApply(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -215,4 +215,12 @@
     <update id="updateLockNum">
         update bus_vehicle_order set lockingNum = #{num} where sid = #{sid}
     </update>
+
+    <select id="getDetails" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
+        select sid,purchaseSystemName from base_purchase_system where useOrgSid = #{createOrgSid} and deptSid = #{deptSid} limit 1
+    </select>
+
+    <select id="selectApply" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply">
+        select orgDeptSid from bus_vehicle_apply where sid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -26,9 +26,8 @@
 package com.yxt.anrui.base.biz.busvehicleorder;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
-import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
 import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
@@ -223,4 +222,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return busVehicleOrderService.updateLockNum(sid,num);
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getDetails(String sid) {
+        return busVehicleOrderService.getDetails(sid);
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -30,9 +30,11 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfoSpanSize;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
@@ -539,4 +541,11 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         baseMapper.updateLockNum(sid,num);
         return rb.success();
     }
+
+    public ResultBean<BasePurchSystemVo> getDetails(String sid) {
+        ResultBean<BasePurchSystemVo> rb = ResultBean.fireFail();
+        BusVehicleApply busVehicleApply = baseMapper.selectApply(sid);
+        BasePurchSystemVo vo = baseMapper.getDetails(busVehicleApply.getCreateOrgSid(),busVehicleApply.getOrgDeptSid());
+        return rb.success().setData(vo);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.*;
@@ -758,13 +759,29 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     }*/
     private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
         String ftl = "";
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        //查询台数
+        String num = priceInfo.getNumber();
+        //单台成交价
+        String transactionPrice = priceInfo.getSingleFinalPrice();
+        String remarks = "";
         if ("现车".equals(appOrderDetailsVo.getOrderType())) {
             //获取模板
             ftl = "existingvehicles";
+            AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+            List<String> stringList = orderModelInfoVo.getVinList();
+            if (stringList.size() > 0) {
+                remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+            } else {
+                remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
+            }
         } else {
             //获取模板
             ftl = "orderacar";
+            remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
         }
+        map.put("remarks", remarks);
+
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -783,6 +800,49 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return pdfName;
     }
 
+    private String genCarSaleContract2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
+        String ftl = "";
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        //查询台数
+        String num = priceInfo.getNumber();
+        //单台成交价
+        String transactionPrice = priceInfo.getSingleFinalPrice();
+        String remarks = "";
+        if ("现车".equals(appOrderDetailsVo.getOrderType())) {
+            //获取模板
+            ftl = "existingvehicles";
+            AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+            List<String> stringList = orderModelInfoVo.getVinList();
+            if (stringList.size() > 0) {
+                remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+            } else {
+                remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
+            }
+        } else {
+            //获取模板
+            ftl = "orderacar";
+            remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
+        }
+        map.put("remarks", remarks);
+
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + ftl + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成文件名
+        String pdfName = "新车买卖合同2_" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        return pdfName;
+    }
+
     /**
      * 生成 新车买卖合同(现车) （空）pdf
      *
@@ -818,6 +878,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         map.put("totalPrice", "");
         map.put("priceRemarks", "");
         map.put("depositTotal", "");
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        //查询台数
+        String num = priceInfo.getNumber();
+        String remarks = "";
         String ftl = "";
         // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
         if ("1".equals(dto.getDiscountKey())) {
@@ -825,10 +889,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if ("现车".equals(appOrderDetailsVo.getOrderType())) {
                 //获取模板
                 ftl = "existingvehicles_black";
+                AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+                List<String> stringList = orderModelInfoVo.getVinList();
+                if (stringList.size() > 0) {
+                    remarks = "主车" + num + "台，单台成交价：        元。车架号：" + String.join("、", stringList);
+                } else {
+                    remarks = "主车" + num + "台，单台成交价：        元。";
+                }
             } else {
                 // 订车获取模板
                 ftl = "orderacar_black";
+                remarks = "主车" + num + "台，单台成交价：        元。";
             }
+            map.put("remarks", remarks);
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -849,6 +922,55 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return url;
     }
 
+    private String genCarSaleContractBlank2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
+        String url = "";
+        map.put("totalPrice", "");
+        map.put("priceRemarks", "");
+        map.put("depositTotal", "");
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        //查询台数
+        String num = priceInfo.getNumber();
+        String remarks = "";
+        String ftl = "";
+        // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
+        if ("1".equals(dto.getDiscountKey())) {
+            // 现车
+            if ("现车".equals(appOrderDetailsVo.getOrderType())) {
+                //获取模板
+                ftl = "existingvehicles_black";
+                AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+                List<String> stringList = orderModelInfoVo.getVinList();
+                if (stringList.size() > 0) {
+                    remarks = "主车" + num + "台，单台成交价：        元。车架号：" + String.join("、", stringList);
+                } else {
+                    remarks = "主车" + num + "台，单台成交价：        元。";
+                }
+            } else {
+                // 订车获取模板
+                ftl = "orderacar_black";
+                remarks = "主车" + num + "台，单台成交价：        元。";
+            }
+            map.put("remarks", remarks);
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+            //生成word文件名
+            String targetPath = docPdfComponent.getUploadTemplateUrl();
+            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+            long seconds = System.currentTimeMillis();
+            String typeName = dateStr + seconds + ".doc";
+            File file = new File(targetPath + ftl + seconds + ".ftl");
+            File dir = new File(targetPath);
+            WordConvertUtils.inputStreamToFile(inputStream, file);
+            WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
+            //新生成的word路径
+            String wordPath = targetPath + typeName;
+            //生成合同文件名
+            String pdfName = "新车买卖空白合同2_" + dateStr + seconds + ".pdf";
+            WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+            url = pdfName;
+        }
+        return url;
+    }
+
     private String getReceiveCar(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
         String url = "";
         //查询销售订单的现车
@@ -888,9 +1010,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String url = "";
         //根据分公司sid查询分公司开票申请
         String invoicName = "";
-        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
         if (invoicingDetailsVoResultBean.getData() != null) {
-            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName());
+            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
             invoicName = invoicingDetailsVoResultBean.getData().getName();
         }
         //查询销售订单的现车
@@ -901,10 +1023,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         if (stringList.size() > 0) {
             for (int i = 0; i < stringList.size(); i++) {
                 InvoicMessageContractVo vo = new InvoicMessageContractVo();
-                vo.setVinNo(stringList.get(i));
+                if (stringList.get(i).length() > 8) {
+                    vo.setVinNo(stringList.get(i).substring(stringList.get(i).length() - 8));
+                } else {
+                    vo.setVinNo(stringList.get(i));
+                }
                 vo.setType(appOrderDetailsVo.getInvoiceType());
-                vo.setInvoicMoney(priceInfo.getSingleFinalPrice());
-                vo.setInvoicName(invoicName);
                 invoicMessageContractVos.add(vo);
             }
         }
@@ -1538,16 +1662,22 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
         //身份证号
         String idNo = crmCustomerTempVo.getIDNumber();
+        if (StringUtils.isBlank(idNo)) {
+            return rb.setMsg("请先在客户洽谈的基础信息中补全客户的身份证号");
+        }
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        //根据车型sid查询车型的全称
+        BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
         //车型
-        String modelName = "车型：" + appOrderModelInfoVo.getModelName() + "。";
+        String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue() + baseVehicleModel.getMarketSegmentsValue() + baseVehicleModel.getSpecifications();
+        String modelName = "车型：" + modelName1 + "。";
         //配置
         String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。";
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
-            String topName = topInfo.getTopName();
+            String topName = appOrderDetailsVo.getTopMessage();
             topName = "上装：" + topName + "。";
             map.put("topName", topName);
         }
@@ -1556,12 +1686,27 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        String remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
+
         //优惠说明
-        //ToDo:
+        //ToDo:discountDetail
+        String discountDetail = "";
+        if (StringUtils.isNotBlank(appOrderDetailsVo.getTotaldiscount())) {
+            List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();
+            discountDetail = "优惠说明：赠送价值" + appOrderDetailsVo.getTotaldiscount() + "元优惠包。包括";
+            for (int iii = 0; iii < discountList.size(); iii++) {
+                AppOrderDiscountListVo vv = discountList.get(iii);
+                String discountName = vv.getDiscountName();
+                if (iii == discountList.size() - 1) {
+                    discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"）。";
+                } else {
+                    discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"），";
+                }
+            }
+            map.put("discountDetail", discountDetail);
+        }
 
         //保险说明
-        String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
+        String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfoMessage() + "。";
         //车价合计
         String totalPrice = priceInfo.getTotalPrice();
         String priceRemarks = "";
@@ -1578,9 +1723,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             listResultBeanData.removeAll(Collections.singleton(null));
             if (!listResultBeanData.isEmpty()) {
                 String depositRemarks = "（其中乙方在";
-                for (BusDepositFictitiousDetailsVo v : listResultBeanData) {
-                    String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金，";
-                    depositRemarks = depositRemarks + b;
+                for (int ii = 0; ii < listResultBeanData.size(); ii++) {
+                    BusDepositFictitiousDetailsVo v = listResultBeanData.get(ii);
+                    if(ii == listResultBeanData.size()-1){
+                        String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金。";
+                        depositRemarks = depositRemarks + b;
+                    }else{
+                        String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金，";
+                        depositRemarks = depositRemarks + b;
+                    }
+
                 }
                 depositRemarks = depositRemarks + "）";
                 map.put("depositRemarks", depositRemarks);
@@ -1589,25 +1741,26 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //车辆交付地点
         String address = priceInfo.getAddress();
         //组装到文档相对应的字段中
-       /* ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
-        if (invoicingDetailsVoResultBean.getData() != null) {
-            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
-        }else{
-            return rb.setMsg("请先完善公司开票信息");
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())){
+            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
+            if (invoicingDetailsVoResultBean.getData() != null) {
+                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+            } else {
+                return rb.setMsg("请先完善公司开票信息");
+            }
         }
         map.put("customerName", customerName);
         map.put("mobile", mobile);
         map.put("idNo", idNo);
         map.put("modelName", modelName);
         map.put("modelConfig", modelConfig);
-        map.put("remarks", remarks);
-        if(appOrderDetailsVo.getInsuranceState()){
+        if ("1".equals(appOrderDetailsVo.getIsInsurance())) {
             map.put("insuranceInfo", insuranceInfo);
         }
         map.put("totalPrice", totalPrice);
         map.put("priceRemarks", priceRemarks);
         map.put("depositTotal", depositTotal);
-        map.put("address", address);*/
+        map.put("address", address);
         //生成合同编号
         String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
         map.put("contractNo", contractNo);
@@ -1618,36 +1771,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ExecutorService pool = new ThreadPoolExecutor(2, 100,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            Future<String> future1 = pool.submit(() -> {
+           /* Future<String> future1 = pool.submit(() -> {
                 return genCarSaleContract(dto, map, appOrderDetailsVo);
             });
+            Future<String> future1_2 = pool.submit(() -> {
+                return genCarSaleContract2(dto, map, appOrderDetailsVo);
+            });*/
             PrintConfirmVo printConfirmVo = null;
             String urlAll = "";
-            /*if (StringUtils.isNotBlank(future1.get())) {
-                printConfirmVo = new PrintConfirmVo();
-                if ("现车".equals(appOrderDetailsVo.getOrderType())) {
-                    printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName()));
-                } else {
-                    printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName()));
-                }
-                printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future1.get());
-                list.add(printConfirmVo);
-                url = future1.get();
-            }
-            Future<String> future2 = pool.submit(() -> {
+           /* Future<String> future2 = pool.submit(() -> {
                 return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
             });
-            if (StringUtils.isNotBlank(future2.get())) {
-                printConfirmVo = new PrintConfirmVo();
-                if ("现车".equals(appOrderDetailsVo.getOrderType())) {
-                    printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName()));
-                } else {
-                    printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName()));
-                }
-                printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
-                list.add(printConfirmVo);
-                url = url + "," + future2.get();
-            }
+            Future<String> future2_2 = pool.submit(() -> {
+                return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
+            });
             //接收车辆委托书
             Future<String> future4 = pool.submit(() -> {
                 return getReceiveCar(map, appOrderDetailsVo);
@@ -1674,6 +1811,30 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 });
             }
             List<File> filesList = new ArrayList<>();
+            if (future1 != null) {
+                if (StringUtils.isNotBlank(future1.get())) {
+                    File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
+                    filesList.add(file);
+                }
+            }
+            if (future1_2 != null) {
+                if (StringUtils.isNotBlank(future1_2.get())) {
+                    File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get());
+                    filesList.add(file);
+                }
+            }
+            if (future2 != null) {
+                if (StringUtils.isNotBlank(future2.get())) {
+                    File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
+                    filesList.add(file);
+                }
+            }
+            if (future2_2 != null) {
+                if (StringUtils.isNotBlank(future2_2.get())) {
+                    File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get());
+                    filesList.add(file);
+                }
+            }
             //合并pdf文件
             if (future8 != null) {
                 if (StringUtils.isNotBlank(future8.get())) {
@@ -1689,7 +1850,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
                 filesList.add(file);
             }
-            if(future6 != null){
+            if (future6 != null) {
                 if (StringUtils.isNotBlank(future6.get())) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
                     filesList.add(file);
@@ -1867,15 +2028,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
                     String key = depositInfo.getDepositTypeKey();
                     BigDecimal bigDecimalKeyAll = new BigDecimal("0");
-                    if("02".equals(key)){
+                    if ("02".equals(key)) {
                         String makeUpAll = depositInfo.getMakeUpDeposit();
-                        if(makeUpAll != null){
+                        if (makeUpAll != null) {
                             bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num)));
                         }
-                    }else{
+                    } else {
                         bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit()));
                     }
-                    if(bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0){
+                    if (bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0) {
                         for (int i = 0; i < vinList.size(); i++) {
                             UnCollectionDto unCollectionDto = new UnCollectionDto();
                             //合同sid
@@ -1987,7 +2148,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
@@ -2089,15 +2251,18 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = commonContract.getProcInstId();
-                ufVo.setProcInsId(procId);
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("合同审核申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+                if ("销售专员申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@@ -2187,8 +2352,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         QueryWrapper<CommonContract> qw = new QueryWrapper<>();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
         String staffSid = sysUserVo.getStaffSid();
-        qw.eq("staffSid",staffSid);
-        if (StringUtils.isNotBlank(params.getNames())){
+        qw.eq("staffSid", staffSid);
+        if (StringUtils.isNotBlank(params.getNames())) {
             qw.and(wrapper -> wrapper.like("contractNo", params.getNames()).or().like("partyB", params.getNames()));
         }
         IPage<CommonContract> page = PagerUtil.queryToPage(query);

anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl

@@ -796,7 +796,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>  ${createOrgName1!}                 </w:t>
+                    <w:t>  ${createOrgName1!}                                 </w:t>
                 </w:r>
                 <w:proofErr w:type="spellEnd"/>
                 <w:r wsp:rsidR="003D769D">
@@ -906,7 +906,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="006A07F8"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>        ${createDate!}                   </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="006A07F8"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="006A07F8"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>        ${createDate!}                        </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="006A07F8"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1533,18 +1533,18 @@
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
-                        <w:sz w:val="20"/>
-                        <w:sz-cs w:val="20"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
                     </w:rPr>
                 </w:pPr>
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
-                        <w:sz w:val="20"/>
-                        <w:sz-cs w:val="20"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>                   年     月     日                        年     月     日</w:t>
+                    <w:t>             年     月     日           年     月     日</w:t>
                 </w:r>
             </w:p>
            <#-- <w:p wsp:rsidR="005D1251" wsp:rsidRDefault="005D1251" wsp:rsidP="005D1251">

anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl

@@ -579,7 +579,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t> ${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@@ -1044,6 +1044,7 @@
                             </w:r>
                         </w:p>
                         </#if>
+                        <#if insuranceInfo??>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
@@ -1067,6 +1068,7 @@
                                 <w:t>${insuranceInfo!}</w:t>
                             </w:r>
                         </w:p>
+                        </#if>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
@@ -1284,7 +1286,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。</w:t>
+                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1409,7 +1411,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t> 甲方：                                乙方：</w:t>
+                    <w:t>甲方：                                乙方：                 </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1468,7 +1470,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1504,7 +1506,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+                <#--<w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1522,7 +1524,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+               <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1530,7 +1532,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                </w:r>
+                </w:r>-->
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1539,7 +1541,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                    <w:t>      地址：</w:t>
+                    <w:t>地址：</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">
@@ -1559,7 +1561,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>                   年     月     日                          年     月     日</w:t>
+                    <w:t>               年     月     日                     年     月     日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="00CE5AB6">

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl

@@ -1203,7 +1203,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>元           ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t>
+                    <w:t>元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1286,7 +1286,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。</w:t>
+                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1411,7 +1411,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t> 甲方：                                       乙方：</w:t>
+                    <w:t>甲方：                                乙方：                 </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1506,7 +1506,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+       <#--         <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1532,7 +1532,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                </w:r>
+                </w:r>-->
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1541,7 +1541,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                    <w:t>    地址：</w:t>
+                    <w:t>地址：</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">
@@ -1561,7 +1561,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>           年       月       日                  年     月       日</w:t>
+                    <w:t>               年     月     日                     年     月     日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="00CE5AB6">

anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl

@@ -582,7 +582,7 @@
                 </w:pPr>
             </w:p>
             <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                <w:pPr>
+                <#--<w:pPr>
                     <w:adjustRightInd w:val="off"/>
                     <w:snapToGrid w:val="off"/>
                     <w:spacing w:line="360" w:line-rule="auto"/>
@@ -593,7 +593,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                </w:pPr>
+                </w:pPr>-->
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -602,7 +602,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>    ${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:proofErr w:type="gramEnd"/>
                 <w:r>
@@ -669,7 +669,7 @@
             </w:p>
             <w:tbl>
                 <w:tblPr>
-                    <w:tblW w:w="0" w:type="auto"/>
+                    <w:tblW w:w="8540" w:type="dxa"/>
                     <w:tblBorders>
                         <w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
                         <w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@@ -682,23 +682,23 @@
                     <w:tblLook w:val="04A0"/>
                 </w:tblPr>
                 <w:tblGrid>
-                    <w:gridCol w:w="861"/>
-                    <w:gridCol w:w="1577"/>
-                    <w:gridCol w:w="1592"/>
-                    <w:gridCol w:w="2316"/>
-                    <w:gridCol w:w="2176"/>
+                    <w:gridCol w:w="863"/>
+                    <w:gridCol w:w="1580"/>
+                    <w:gridCol w:w="2779"/>
+                    <w:gridCol w:w="1542"/>
+                    <w:gridCol w:w="1776"/>
                 </w:tblGrid>
-                <w:tr wsp:rsidR="00E41CA7">
+                <w:tr wsp:rsidR="0081402C" wsp:rsidTr="00160E50">
                     <w:trPr>
-                        <w:trHeight w:val="382"/>
+                        <w:trHeight w:val="18"/>
                     </w:trPr>
                     <w:tc>
                         <w:tcPr>
-                            <w:tcW w:w="861" w:type="dxa"/>
+                            <w:tcW w:w="863" w:type="dxa"/>
                             <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
                             <w:vAlign w:val="center"/>
                         </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
+                        <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
@@ -722,12 +722,13 @@
                     </w:tc>
                     <w:tc>
                         <w:tcPr>
-                            <w:tcW w:w="1577" w:type="dxa"/>
+                            <w:tcW w:w="1580" w:type="dxa"/>
                             <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
                             <w:vAlign w:val="center"/>
                         </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
+                        <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000" wsp:rsidP="005817AE">
                             <w:pPr>
+                                <w:jc w:val="center"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
                                     <wx:font wx:val="宋体"/>
@@ -750,11 +751,12 @@
                     </w:tc>
                     <w:tc>
                         <w:tcPr>
-                            <w:tcW w:w="1592" w:type="dxa"/>
+                            <w:tcW w:w="2779" w:type="dxa"/>
                             <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
                         </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
+                        <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000" wsp:rsidP="005817AE">
                             <w:pPr>
+                                <w:jc w:val="center"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
                                     <wx:font wx:val="宋体"/>
@@ -777,10 +779,10 @@
                     </w:tc>
                     <w:tc>
                         <w:tcPr>
-                            <w:tcW w:w="2316" w:type="dxa"/>
+                            <w:tcW w:w="1542" w:type="dxa"/>
                             <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
                         </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
+                        <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:jc w:val="center"/>
                                 <w:rPr>
@@ -805,12 +807,13 @@
                     </w:tc>
                     <w:tc>
                         <w:tcPr>
-                            <w:tcW w:w="2176" w:type="dxa"/>
+                            <w:tcW w:w="1776" w:type="dxa"/>
                             <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
                             <w:vAlign w:val="center"/>
                         </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
+                        <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000" wsp:rsidP="00C40727">
                             <w:pPr>
+                                <w:jc w:val="center"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
                                     <wx:font wx:val="宋体"/>
@@ -833,165 +836,168 @@
                     </w:tc>
                 </w:tr>
                 <#list invoicList as invoic>
-                <w:tr wsp:rsidR="00E41CA7">
-                    <w:trPr>
-                        <w:trHeight w:val="1144"/>
-                    </w:trPr>
-                    <w:tc>
-                        <w:tcPr>
-                            <w:tcW w:w="861" w:type="dxa"/>
-                            <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-                            <w:vAlign w:val="center"/>
-                        </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                            <w:pPr>
-                                <w:jc w:val="center"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                                <w:t>${invoic_index+1}</w:t>
-                            </w:r>
-                        </w:p>
-                    </w:tc>
-                    <w:tc>
-                        <w:tcPr>
-                            <w:tcW w:w="1577" w:type="dxa"/>
-                            <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-                            <w:vAlign w:val="center"/>
-                        </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                            <w:pPr>
-                                <w:jc w:val="center"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                                <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.vinNo!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
-                            </w:r>
-                        </w:p>
-                    </w:tc>
-                    <w:tc>
-                        <w:tcPr>
-                            <w:tcW w:w="1592" w:type="dxa"/>
-                            <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-                        </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00E41CA7">
-                            <w:pPr>
-                                <w:jc w:val="left"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz-cs w:val="21"/>
-                                </w:rPr>
-                            </w:pPr>
-                        </w:p>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                            <w:pPr>
-                                <w:jc w:val="left"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz-cs w:val="21"/>
-                                </w:rPr>
-                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                                <w:t>${invoic.type!}</w:t>
-                            </w:r>
-                        </w:p>
-                    </w:tc>
-                    <w:tc>
-                        <w:tcPr>
-                            <w:tcW w:w="2316" w:type="dxa"/>
-                            <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-                            <w:vAlign w:val="center"/>
-                        </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                            <w:pPr>
-                                <w:jc w:val="center"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                                <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicMoney!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
-                            </w:r>
-                        </w:p>
-                    </w:tc>
-                    <w:tc>
-                        <w:tcPr>
-                            <w:tcW w:w="2176" w:type="dxa"/>
-                            <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-                            <w:vAlign w:val="center"/>
-                        </w:tcPr>
-                        <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
-                            <w:pPr>
-                                <w:jc w:val="left"/>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
-                                    <wx:font wx:val="宋体"/>
-                                    <w:kern w:val="0"/>
-                                    <w:sz w:val="28"/>
-                                    <w:sz-cs w:val="28"/>
-                                </w:rPr>
-                                <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicName!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
-                            </w:r>
-                        </w:p>
-                    </w:tc>
-                </w:tr>
+                    <w:tr wsp:rsidR="0081402C" wsp:rsidTr="00160E50">
+                        <w:trPr>
+                            <w:trHeight w:val="323"/>
+                        </w:trPr>
+                        <w:tc>
+                            <w:tcPr>
+                                <w:tcW w:w="863" w:type="dxa"/>
+                                <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                <w:vAlign w:val="center"/>
+                            </w:tcPr>
+                            <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:jc w:val="center"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t>${invoic_index+1}</w:t>
+                                </w:r>
+                            </w:p>
+                        </w:tc>
+                        <w:tc>
+                            <w:tcPr>
+                                <w:tcW w:w="1580" w:type="dxa"/>
+                                <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                <w:vAlign w:val="center"/>
+                            </w:tcPr>
+                            <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:jc w:val="center"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.vinNo!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
+                                </w:r>
+                            </w:p>
+                        </w:tc>
+                        <w:tc>
+                            <w:tcPr>
+                                <w:tcW w:w="2779" w:type="dxa"/>
+                                <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                            </w:tcPr>
+                            <w:p wsp:rsidR="0081402C" wsp:rsidRPr="00051004" wsp:rsidRDefault="00BF3E36"
+                                 wsp:rsidP="00051004">
+                                <w:pPr>
+                                    <w:widowControl/>
+                                    <w:jc w:val="left"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="24"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:color w:val="000000"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t></w:t>
+                                </w:r>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:color w:val="000000"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t>${invoic.type!}</w:t>
+                                </w:r>
+                            </w:p>
+                        </w:tc>
+                        <w:tc>
+                            <w:tcPr>
+                                <w:tcW w:w="1542" w:type="dxa"/>
+                                <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                <w:vAlign w:val="center"/>
+                            </w:tcPr>
+                            <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:jc w:val="center"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t></w:t></w:r><w:r wsp:rsidR="0073129A"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.money!}</w:t></w:r><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
+                                </w:r>
+                            </w:p>
+                        </w:tc>
+                        <w:tc>
+                            <w:tcPr>
+                                <w:tcW w:w="1776" w:type="dxa"/>
+                                <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                <w:vAlign w:val="center"/>
+                            </w:tcPr>
+                            <w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:jc w:val="left"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:kern w:val="0"/>
+                                        <w:sz w:val="28"/>
+                                        <w:sz-cs w:val="28"/>
+                                    </w:rPr>
+                                    <w:t></w:t></w:r><w:r wsp:rsidR="004558CF"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t></w:r><w:r wsp:rsidR="0073129A"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.name!}</w:t></w:r><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
+                                </w:r>
+                            </w:p>
+                        </w:tc>
+                    </w:tr>
                 </#list>
             </w:tbl>
             <w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00E41CA7">

anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl

@@ -640,7 +640,7 @@
                         <w:u w:val="single"/>
                         <w:lang w:val="EN-US"/>
                     </w:rPr>
-                    <w:t>   ${createOrgName!}       </w:t>
+                    <w:t>${createOrgName!}       </w:t>
                 </w:r>
                 <w:proofErr w:type="spellEnd"/>
                 <w:proofErr w:type="gramStart"/>
@@ -1342,7 +1342,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:lang w:val="EN-US"/>
                     </w:rPr>
-                    <w:t>                                               年       月      日</w:t>
+                    <w:t>                           年       月      日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="009D3B52" wsp:rsidRPr="00631439">

anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

@@ -900,7 +900,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>    ${customerName!}    </w:t>
+                    <w:t>   ${customerName!}   </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -919,7 +919,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t> ${mobile!} </w:t>
+                    <w:t>   ${mobile!}  </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1257,7 +1257,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${totalPrice!}   </w:t>
+                    <w:t>  ${totalPrice!}   </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1317,7 +1317,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t> ${depositTotal!} </w:t>
+                    <w:t>  ${depositTotal!}  </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1358,7 +1358,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>    ${address!}    </w:t>
+                    <w:t>    ${address!}   </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1409,7 +1409,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。</w:t>
+                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1535,7 +1535,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t> 甲方：                            乙方：</w:t>
+                    <w:t>甲方：                                乙方：                 </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1630,7 +1630,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+               <#-- <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1656,7 +1656,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                </w:r>
+                </w:r>-->
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1665,7 +1665,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                    <w:t>    地址：</w:t>
+                    <w:t>地址：</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">
@@ -1685,7 +1685,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>               年       月       日                         年     月     日</w:t>
+                    <w:t>             年     月     日                     年     月     日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="008F6CBB">

anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl

@@ -1257,7 +1257,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>                  ${totalPrice!}   </w:t>
+                    <w:t>                   ${totalPrice!}   </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1317,7 +1317,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>           ${depositTotal!} </w:t>
+                    <w:t>               ${depositTotal!}  </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1326,7 +1326,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>元      ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t>
+                    <w:t>元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1358,7 +1358,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>    ${address!}    </w:t>
+                    <w:t>    ${address!}   </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1409,7 +1409,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。</w:t>
+                    <w:t>六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1535,7 +1535,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t> 甲方：                           乙方：</w:t>
+                    <w:t>甲方：                                乙方：                 </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -1630,7 +1630,7 @@
                     </w:rPr>
                     <w:tab/>
                 </w:r>
-                <w:r>
+       <#--         <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                         <wx:font wx:val="宋体"/>
@@ -1656,7 +1656,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                </w:r>
+                </w:r>-->
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1665,7 +1665,7 @@
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
                     <w:tab/>
-                    <w:t>   地址：</w:t>
+                    <w:t>地址：</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">
@@ -1685,7 +1685,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>               年      月      日                        年      月      日</w:t>
+                    <w:t>             年     月     日                     年     月     日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="008F6CBB">

anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl

@@ -622,7 +622,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${createOrgName!}     </w:t>
+                    <w:t>${createOrgName!}     </w:t>
                 </w:r>
                 <w:proofErr w:type="spellEnd"/>
                 <w:proofErr w:type="gramStart"/>
@@ -1157,7 +1157,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="00053B2C"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/><wx:font wx:val="宋体"/><w:color w:val="000000"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>                                                                                ${vinNo!}   </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="00053B2C"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/><wx:font wx:val="宋体"/><w:color w:val="000000"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="00053B2C"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/><wx:font wx:val="宋体"/><w:color w:val="000000"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>                  ${vinNo!}                                   </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="00053B2C"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/><wx:font wx:val="宋体"/><w:color w:val="000000"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>     </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1171,6 +1171,150 @@
                     </w:rPr>
                     <w:t></w:t>
                 </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
+                <w:r wsp:rsidR="00F10F0A">
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:color w:val="000000"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="28"/>
+                        <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:tab/>
+                </w:r>
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
@@ -1307,7 +1451,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           年</w:t>
+                    <w:t>     年</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1326,7 +1470,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>       月</w:t>
+                    <w:t>     月</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1345,7 +1489,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>       日至</w:t>
+                    <w:t>     日至</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1364,7 +1508,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>       年</w:t>
+                    <w:t>     年</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1383,7 +1527,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>       月</w:t>
+                    <w:t>     月</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1402,7 +1546,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>       日</w:t>
+                    <w:t>     日</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00460A50" wsp:rsidRDefault="00460A50"/>

anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js

@@ -25,3 +25,20 @@ export function selectByZjcAndUseOrgIsNull() {
     method: 'get'
   })
 }
+
+// 获取分公司
+export function getListOrg(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListOrg',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据分公司Sid获取分公司下所有的部门
+export function getListDeptByOrgSid(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
+    method: 'GET'
+  })
+}

anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 根据条件分页查询数据的列表 已改
+export function pagerList(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/listPage',
+    data: data,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 新增保存 已改
+export function save(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/save',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 删除 已改
+export function delBySids(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/delBySids',
+    method: 'DELETE',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 详情以及修改回显 已改
+export function fetchDetailsBySid(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/fetchDetailsBySid/' + data,
+    method: 'get',
+    params: qs.stringify(data)
+  })
+}

anrui-base/anrui-base-ui/src/router/index.js

@@ -360,8 +360,22 @@ export const constantRoutes = [
       meta: { title: '资料清单',noCache: true, }
     }]
   },
-
-
+  // 8、采购系统
+  {
+    path: '/caigouxitong',
+    component: Layout,
+    redirect: '/caigouxitong',
+    meta: { title: '采购系统' },
+    children: [
+      {
+        path: '/caigouxitong/purchasingsystem',
+        component: () =>
+          import('@/views/caigouxitong/purchasingsystem.vue'),
+        name: 'PurchasingSystem',
+        meta: { title: '采购系统', noCache: true }
+      }
+    ]
+  },
 	{
 		path: '/404',
 		component: () =>

anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="采购系统管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司名称">
+                <el-select v-model="listQuery.params.useOrgSid" placeholder="请选择" clearable filterable @change="changeUseOrg">
+                  <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" clearable placeholder=""/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">采购系统列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="60" type="selection" align="center"/>
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" width="100px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="分公司" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="部门" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.deptName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="采购系统" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseSystemName }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <purchasingsystemAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+  </div>
+</template>
+
+<script>
+import { pagerList, delBySids } from '@/api/system/purchasingsystem/purchasingsystem'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import purchasingsystemAdd from './purchasingsystemAdd.vue'
+import { getListOrg, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PurchasingSystem',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    purchasingsystemAdd
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1,
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      sids: [],
+      org_list: [],
+      orgDept_list: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemName: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      getListOrg().then((resp) => {
+        if (resp.success) {
+          this.org_list = resp.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('sids', this.sids)
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      pagerList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemSid: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      }
+      this.getList()
+    },
+    changeUseOrg(value) {
+      getListDeptByOrgSid(value).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        delBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
+</style>

anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="4" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.useOrgName" placeholder="请选择" clearable filterable @change="changeOrg">
+                  <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>部门</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.deptName" placeholder="请选择" clearable filterable @change="changeOrgDept">
+                  <el-option v-for="item in orgDept_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>采购系统</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><el-input v-model="formobj.purchaseSystemName" clearable placeholder="" style="width: 20%" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import { save, fetchDetailsBySid } from '@/api/system/purchasingsystem/purchasingsystem'
+import { getListOrg, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PurchasingSystemAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      org_list: [],
+      orgDept_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        deptName: '',
+        deptSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        purchaseSystemName: ''
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      getListOrg().then((resp) => {
+        if (resp.success) {
+          this.org_list = resp.data
+        }
+      })
+    },
+    showAdd() {
+      this.$nextTick(() => {
+        this.init()
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【新增】采购系统'
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+        this.init()
+      })
+      this.viewTitle = '【编辑】采购系统'
+      console.log('编辑回显', row.sid)
+      fetchDetailsBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          getListDeptByOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    changeOrg(value) {
+      const choose = this.org_list.filter((item) => item.name === value)
+      this.formobj.useOrgSid = choose[0].sid
+      getListDeptByOrgSid(choose[0].sid).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
+    changeOrgDept(value) {
+      const choose = this.orgDept_list.filter((item) => item.name === value)
+      this.formobj.deptSid = choose[0].sid
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          save(this.formobj).then((resp) => {
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        deptName: '',
+        deptSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        purchaseSystemName: ''
+      }
+      this.submitdisabled = false
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
+

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -143,12 +143,12 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(@RequestBody PagerQuery<BusDeliveredExamineQuery> pq);
 
-    @ApiOperation("提交车库移库审批流程")
+    @ApiOperation("提交出库审批流程")
     @PostMapping("/submitDeliveredApply")
     @ResponseBody
     public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);
 
-    @ApiOperation("App-提交车库移库审批流程")
+    @ApiOperation("App-提交出库审批流程")
     @PostMapping("/submitAppDeliveredApply")
     @ResponseBody
     public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);

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

@@ -126,4 +126,11 @@ public class BusSalesOrder extends BaseEntity {
     private String licensePlateKey;
     @ApiModelProperty("是否包牌")
     private String licensePlateValue;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
+    @ApiModelProperty("补充说明附件")
+    private String imagesFile;
 }

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

@@ -188,7 +188,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean updateNodesBySid(@RequestBody AppOrderRemarkDto dto);
 
-    @ApiOperation("更新销售订单补充说明")
+    @ApiOperation("初始化销售订单补充说明")
+    @GetMapping("/getOrderRemarksInfo")
+    @ResponseBody
+    ResultBean<OrderRemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid);
+
+    @ApiOperation("更新销售订单合同编号")
     @PutMapping("/updateContractNoBySid")
     @ResponseBody
     ResultBean updateContractNoBySid(@RequestBody AppOrderContractNoDto dto);

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

@@ -165,6 +165,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java

@@ -26,4 +26,9 @@ public class AppNowCarListVo implements Vo {
     @ApiModelProperty("上装sid")
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java

@@ -24,4 +24,9 @@ public class AppNowCarVo implements Vo {
     private String virtual;
     @ApiModelProperty("上装配置sid")
     private String topSid;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java

@@ -31,5 +31,10 @@ public class AppReadyCarListVo implements Vo {
 
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java

@@ -32,4 +32,9 @@ public class AppReadyCarVo implements Vo {
     @ApiModelProperty("上装配置sid")
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -102,5 +102,18 @@ public class AppOrderDetailsVo implements Vo {
     //中介人2
     private SubmitVo intermediary2;
 
+    @ApiModelProperty("是否包含保险：0不包含，1包括")
+    private String isInsurance;
+    @ApiModelProperty("合同中的保险说明")
+    private String insuranceInfoMessage;
+
+    @ApiModelProperty("合同中的上装信息")
+    private String topMessage;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/8 9:54
@@ -17,4 +19,7 @@ public class AppOrderRemarkDto implements Dto {
 
     @ApiModelProperty(value = "备注说明")
     private String remarks;
+
+    @ApiModelProperty("补充说明附件")
+    private List<String> images;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 14:30
+ * @Description
+ */
+@Data
+public class OrderRemarksVo implements Vo {
+    private static final long serialVersionUID = -5111561669820677541L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty(value = "补充说明")
+    private String remarks;
+
+    @ApiModelProperty("补充说明附件")
+    private List<String> images;
+
+    private String imagesFile;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -2256,8 +2256,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                         MessageFlowVo messageFlowVo = new MessageFlowVo();
                         BeanUtil.copyProperties(ufVo, messageFlowVo);
-                        ufVo.setProcInsId(busMainDeposit.get().getProcInsId());
-                        ufVo.setProcDefId(busMainDeposit.get().getProcDefId());
+                        messageFlowVo.setProcInsId(busMainDeposit.get().getProcInsId());
+                        messageFlowVo.setProcDefId(busMainDeposit.get().getProcDefId());
                         messageFlowableQuery.setUfVo(messageFlowVo);
                         messageFlowableQuery.setAppMap(appMap);
                         messageFlowableQuery.setBusinessSid(query.getBusinessSid());
@@ -2268,8 +2268,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         }
                         ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                        String nextName = listResultBean.getData().get(0).getName_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
+//                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
+                        if ("销售专员申请".equals(nextName)) {
                             messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                         } else {
                             messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@@ -2280,8 +2282,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     Future future2 = pool.submit(() -> {
                         ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                        String nextName = listResultBean.getData().get(0).getName_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
+//                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
+                        if ("销售专员申请".equals(nextName)) {
                             //更新已选择的车架号的状态为未锁定
                             AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
                             List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
@@ -2323,9 +2327,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 String procId = busMainDeposit.getProcInsId();
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
-                    if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
+//                    if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
+                    if ("销售专员申请".equals(nextName)) {
                         //更新已选择的车架号的状态为未锁定
                         AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
                         if (appBusDepositVehicleDetailVo != null) {

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

@@ -190,4 +190,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     int updateMakeUp(@Param("sid") String salesOrderSid, @Param("isTop") String i);
 
     int updateMakeUp1(String salesOrderSid);
+
+    int updatePurchaseSystem(@Param("purchaseSystemName") String purchaseSystemName, @Param("purchaseSystemSid") String purchaseSystemSid, @Param("salesOrderSid") String salesOrderSid);
+
+    int updateImages(@Param("imagesFile") String imagesFile, @Param("sid") String sid);
 }

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

@@ -207,7 +207,9 @@
                bo.payType,
                bo.useOrgSid,
                bo.licensePlateValue,
-               bo.staffSid
+               bo.staffSid,
+               bo.purchaseSystemSid,
+               bo.purchaseSystemName
         from bus_sales_order bo
         where sid = #{sid}
     </select>
@@ -303,4 +305,15 @@
         set isTop = NULL
         where sid = #{salesOrderSid}
     </update>
+
+    <update id="updatePurchaseSystem">
+        update bus_sales_order
+        set purchaseSystemName = #{purchaseSystemName},
+            purchaseSystemSid  = #{purchaseSystemSid}
+        where sid = #{salesOrderSid}
+    </update>
+
+    <update id="updateImages">
+        update bus_sales_order set imagesFile = #{imagesFile} where sid = #{sid}
+    </update>
 </mapper>

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

@@ -236,6 +236,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.updateNodesBySid(dto);
     }
 
+    @Override
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return busSalesOrderService.getOrderRemarksInfo(saleOrderSid);
+    }
+
     @Override
     public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
         return busSalesOrderService.updateContractNoBySid(dto);

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitF
 import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
@@ -80,6 +81,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDt
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
@@ -1183,8 +1185,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String procId1 = busSalesOrder1.getProcInstId();
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId1);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) {
+                if ("销售订单申请".equals(nextName)) {
                     ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                     AppOrderDetailsVo vo = details.getData();
                     if ("现车".equals(vo.getOrderType())) {
@@ -1209,59 +1213,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
-                try {
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                            .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                            0L, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                    busSalesOrder.set(fetchBySid(query.getBusinessSid()));
-                    String procId = busSalesOrder.get().getProcInstId();
-                    Future future1 = pool.submit(() -> {
-                        //极光推送
-                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                        MessageFlowVo messageFlowVo = new MessageFlowVo();
-                        BeanUtil.copyProperties(ufVo, messageFlowVo);
-                        ufVo.setProcInsId(procId);
-                        messageFlowableQuery.setUfVo(messageFlowVo);
-                        messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
-                        messageFlowableQuery.setBusinessSid(query.getBusinessSid());
-                        messageFlowableQuery.setModuleName("销售订单申请");
-                        ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId);
-                        String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
-                        List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
-                        if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) {
-                            messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
-                        } else {
-                            messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                        }
-
-                        messageFlowableQuery.setMsgTitle("销售订单");
-                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-                    });
-                    /*Future future2 = pool.submit(() -> {
-                        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
-                        String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
-                        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.get().getStaffSid())) {
-                            ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
-                            AppOrderDetailsVo vo = details.getData();
-                            if ("现车".equals(vo.getOrderType())) {
-                                //更新已选择的车架号的状态为未锁定
-                                List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
-                                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
-                                busMainDepositUpdateQuery.setVinSidList(list);
-                                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
-                                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
-                                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-                            }
-                        }
-                    });*/
 
-                } catch (Exception e) {
-                    e.printStackTrace();
+                //极光推送
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcInsId(procId1);
+                messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
+                messageFlowableQuery.setBusinessSid(query.getBusinessSid());
+                messageFlowableQuery.setModuleName("销售订单申请");
+                ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1);
+                String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
+                String nextName2 = listResultBean2.getData().get(0).getName_();
+//                        if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) {
+                if ("销售订单申请".equals(nextName2)) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
 
+                messageFlowableQuery.setMsgTitle("销售订单");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
 
                 return rb.success();
             }
@@ -1366,8 +1342,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String procId = busSalesOrder.getProcInstId();
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) {
+                if ("销售订单申请".equals(nextName)) {
                     ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                     AppOrderDetailsVo vo = details.getData();
                     if ("现车".equals(vo.getOrderType())) {
@@ -1498,7 +1476,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //金融方案状态
             vo.setFinanceInfoState(0);
             //补充说明状态
-            if (StringUtils.isNotBlank(busSalesOrder.getNotes())) {
+            if (StringUtils.isNotBlank(busSalesOrder.getNotes()) && StringUtils.isNotBlank(busSalesOrder.getImagesFile())) {
                 vo.setRemarksStete(1);
                 vo.setRemarks(busSalesOrder.getNotes());
             } else {
@@ -1860,6 +1838,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //将该车型下的所有现车的车架号组合放入集合中
                     vinNoList.add(vehicleOrderVo.getVin());
                     vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
+                    //根据车辆sid查询该车架号的采购系统
+                    ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                    if(vehicleSelectVoResultBean.getData() != null){
+                        BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                        appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appNowCars.add(appNowCarVo);
                 }
 
@@ -1881,6 +1870,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
                             vinNoList.add(vehicleOrderVo.getVin());
                             vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
+                            //根据车辆sid查询该车架号的采购系统
+                            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                            if(vehicleSelectVoResultBean.getData() != null){
+                                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                                //采购系统sid
+                                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                                //采购系统名称
+                                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                                appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                                appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                            }
                             appNowCars.add(appNowCarVo);
                         }
                     }
@@ -1914,6 +1914,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     //将每个采购订单的编号及可使用数量放入map集合中用来对比车型信息是否发生了变化
                     map.put(applyListVo.getOrderId(), appReadyCarVo.getCanUseNum());
+                    //根据采购订单查询采购系统的sid和采购系统的名称
+                    ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid());
+                    if(getDetails.getData() != null){
+                        BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                        appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appReadyCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appReadyCar.add(appReadyCarVo);
                 }
                 appCarInfo.setReadyCar(appReadyCar);
@@ -2091,6 +2102,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据车辆sid查询该车架号的采购系统
+                    ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                    if(vehicleSelectVoResultBean.getData() != null){
+                        BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                        appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appNowCars.add(appNowCarVo);
                 }
             }
@@ -2109,6 +2131,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                         AppNowCarVo appNowCarVo = new AppNowCarVo();
                         BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                        //根据车辆sid查询该车架号的采购系统
+                        ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                        if(vehicleSelectVoResultBean.getData() != null){
+                            BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                            //采购系统sid
+                            String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                            //采购系统名称
+                            String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                            appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                            appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                        }
                         appNowCars.add(appNowCarVo);
                     }
                 }
@@ -2142,6 +2175,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     } else {
                         appReadyCarVo.setCanUseNum("0");
                     }
+                    //根据采购订单查询采购系统的sid和采购系统的名称
+                    ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid());
+                    if(getDetails.getData() != null){
+                        BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                        appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appReadyCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appReadyCar.add(appReadyCarVo);
                 }
             }
@@ -2362,6 +2406,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
+        List<String> images = dto.getImages();
+        if(images.size()>0){
+            String imagesFile = images.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+            int i = baseMapper.updateImages(imagesFile,sid);
+        }
         //根据销售订单sid更新补充说明字段
         int i = baseMapper.updateNodesBySid(dto.getRemarks(), sid);
         return rb.success().setMsg("保存成功");
@@ -2726,6 +2775,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vo.setUserSid(busSalesOrder.getCreateBySid());
         vo.setProcInsId(busSalesOrder.getProcInstId());
         vo.setTaskId(busSalesOrder.getTaskId());
+        vo.setIsInsurance(busSalesOrder.getIsInsurance());
         vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance()));
         vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()));
         //根据销售部门sid查询分公司名称
@@ -2750,6 +2800,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
                 }
                 vo.setInsuranceInfo(info);
+                String infoMessage = "公司投保、"+x2+busSalesOrderInsurance.getInsuranceNum();
+                vo.setInsuranceInfoMessage(infoMessage);
             }
         } else {
             if ("0".equals(busSalesOrder.getIsInsurance())) {
@@ -2807,6 +2859,53 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 vo.setTopInfo(topInfo);
             }
+            BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
+            String topMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())){
+                topMessage = topMessage+busSalesOrderMakeup.getTopName();
+            }
+            //委改方式
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitMethod())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitMethod();
+            }
+            //委改厂
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitFactory())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitFactory();
+            }
+            //外廓尺寸
+            String sizeMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())){
+                sizeMessage = "外廓尺寸"+busSalesOrderMakeup.getSizeLong()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeWide())){
+                sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeWide()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeHigh())){
+                sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeHigh()+"mm";
+            }
+            if(StringUtils.isNotBlank(sizeMessage)){
+                topMessage = topMessage+ " "+ sizeMessage;
+            }
+            //板材厚度
+            String ssMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())){
+                ssMessage = "板材厚度"+busSalesOrderMakeup.getThicknessBottom()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())){
+                ssMessage = ssMessage+"*"+busSalesOrderMakeup.getThicknessEdge()+"mm";
+            }
+            if(StringUtils.isNotBlank(ssMessage)){
+                topMessage = topMessage+ " "+ ssMessage;
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getPlateMaterial();
+            }
+            //公告型号
+            //其他配置
+            /*if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())){
+                topMessage = topMessage+busSalesOrderMakeup.getMoreConfig();
+            }*/
+            vo.setTopMessage(topMessage);
         }
         /***************************主车优惠***************************************/
         List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
@@ -3531,4 +3630,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public int updateMakeUp1(String salesOrderSid) {
         return baseMapper.updateMakeUp1(salesOrderSid);
     }
+
+    public int updatePurchaseSystem(String purchaseSystemName, String purchaseSystemSid, String salesOrderSid) {
+        return baseMapper.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
+    }
+
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        /*ResultBean<OrderRemarksVo> rb = ResultBean.fireFail();
+        OrderRemarksVo vo = baseMapper.getOrderRemarksInfo(saleOrderSid);
+        String imageFile = vo.getImagesFile();
+        if(StringUtils.isNotBlank(imageFile)){
+            List<String> imagesFile = Arrays.
+
+        }
+        return rb.success().setData(vo);*/
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -81,4 +81,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
      * @return
      */
     AppOrderTopInfoVo selectTop(String sid);
+
+    BusSalesOrderMakeup detailsss(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -94,4 +94,8 @@
         FROM bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="detailsss" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
+        select * from bus_sales_order_makeup where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -248,4 +248,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public AppOrderTopInfoVo selectTop(String sid) {
         return baseMapper.selectTop(sid);
     }
+
+    public BusSalesOrderMakeup detailsss(String sid) {
+        return baseMapper.detailsss(sid);
+    }
 }

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

@@ -26,16 +26,21 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -54,6 +59,11 @@ import java.util.List;
 @Service
 public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrderVehicleMapper, BusSalesOrderVehicle> {
 
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
@@ -82,7 +92,21 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     }
 
     public List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        List<AppNowCarListVo> voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        voList.removeAll(Collections.singleton(null));
+        for (AppNowCarListVo vv : voList){
+            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vv.getCarSid());
+            if(vehicleSelectVoResultBean.getData() != null){
+                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                //采购系统sid
+                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                //采购系统名称
+                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                vv.setPurchaseSystemSid(purchaseSystemSid);
+                vv.setPurchaseSystemName(purchaseSystemName);
+            }
+        }
+        return voList;
        /* List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppNowCarList> appNowCars = new ArrayList<>();
         for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) {
@@ -97,6 +121,19 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
 
     public void saveAppVehicle(List<AppBusSalesOrderVehicleDto> nowCarList, String salesOrderSid) {
         if (nowCarList.size() > 0) {
+            String linkSid = nowCarList.get(0).getLinkSid();
+            //根据车辆sid查询采购系统sid和采购系统名称
+            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(linkSid);
+            if(vehicleSelectVoResultBean.getData() != null){
+                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                //采购系统sid
+                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                //采购系统名称
+                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                //根据销售订单sid更新采购系统sid和采购系统名称
+                busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
+
+            }
             for (int i = 0; i < nowCarList.size(); i++) {
                 AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList.get(i);
                 if (appBusSalesOrderVehicleDto != null) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -26,14 +26,20 @@
 package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppReadyCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -52,6 +58,10 @@ import java.util.List;
 @Service
 public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehicleOrderMapper, BusSalesVehicleOrder> {
 
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusVehicleOrderFeign busVehicleOrderFeign;
     public void saveOrder(List<BusSalesVehicleOrderDto> vehicleList, String sid) {
         if (vehicleList.size() > 0) {
             for (int i = 0; i < vehicleList.size(); i++) {
@@ -86,7 +96,24 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     }
 
     public List<AppReadyCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        List<AppReadyCarListVo> voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        voList.removeAll(Collections.singleton(null));
+        if(!voList.isEmpty()){
+            for (AppReadyCarListVo vv : voList){
+                //根据采购订单查询采购系统的sid和采购系统的名称
+                ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(vv.getSid());
+                if(getDetails.getData() != null){
+                    BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                    //采购系统sid
+                    String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                    //采购系统名称
+                    String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                    vv.setPurchaseSystemSid(purchaseSystemSid);
+                    vv.setPurchaseSystemName(purchaseSystemName);
+                }
+            }
+        }
+        return voList;
       /*  List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppReadyCarListVo> appReadyCar = new ArrayList<>();
         for (BusSalesVehicleOrder busSalesVehicleOrder : stringList) {
@@ -101,6 +128,18 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
 
     public void saveAppOrder(List<AppBusSalesVehicleOrderDto> readyCarList, String salesOrderSid) {
         if (readyCarList.size() > 0) {
+            String linkSid = readyCarList.get(0).getLinkSid();
+            //根据采购订单查询采购系统的sid和采购系统的名称
+            ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(linkSid);
+            if(getDetails.getData() != null){
+                BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                //采购系统sid
+                String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                //采购系统名称
+                String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                //根据销售订单sid更新采购系统sid和采购系统名称
+                busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
+            }
             for (int i = 0; i < readyCarList.size(); i++) {
                 AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();

anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx

@@ -1,28 +0,0 @@
-                        新车买卖合同（现车）
-
-甲方(出卖方) ：  ${name}                                                           
-乙方(买受方）：  ${customerName}                                                       
-  乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下：
-   标的车辆基本信息
-                                       
-                                 品牌型号
-                                   车架号
-                                    备注
-                                       1
-${car_brand}
-${car_vinNo}
-                                ${car_remarks}
-二、单台车的车价为    ${monry}    元（大写          ${money1}                      ）
-  三、乙方向甲方交纳订金  ${money2}        元，乙方提车时交清全部车款。甲方未收到全款前，
-车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。
-四、车辆交付地点       ${address}                            ，乙方自提。
-五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。
-六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。
-七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。
-乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。
-八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。
-    九、本合同双方签字或盖章之时生效。
-     
- 甲方：分公司名称（打印）                            乙方：  客户签字
-          年  月   日                                          年   月   日
-

anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx

@@ -1,54 +0,0 @@
-                        新车买卖合同（订车）
-
-甲方(出卖方) ：  ${name}                                                          
-乙方(买受方）：   ${customerName}                                                       
-  乙方从甲方以全款方式订购车辆        台，现将双方权利和义务约定如下：
-   甲方按照乙方要求订购排产的车辆型号及配置要求如下：
-                                  ${carModel}
-                                   ${brand}
-                                  ${manName}
-                                   ${color}
-                                 ${engineType}
-                                       
-                                       
-                                       
-                                       
-                                       
-                                ${gearboxType}
-                                  ${rearAxle}
-                                  ${capacity}
-                                 ${displament}
-${power}
-                                       
-                                       
-                                       
-                                       
-                                       
-                                 ${driveForm}
-                                 ${airCondit}
-${tyreSpecifi}
-                                    开门
-                                 举升方式
-                                       
-                                       
-                                       
-                                       
-                                       
-                                 货厢尺寸
-外廓尺寸：长            宽             高             
-板材材质：                      板材厚度：        
-其他说明：
-其他配置要求：${config}
-二、单台车的车价为               元（大写                                ）
-三、乙方向甲方交纳订金          元，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。
-四、车辆交付地点                                     ，乙方自提。
-五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。
-六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。
-七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。
-乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。
-八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。
-    九、本合同双方签字或盖章之时生效。
-            
-        甲方：                                             乙方：
-                 年   月   日                                        年   月   日
-

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -81,3 +81,20 @@ export function selectNameByOrg(data) {
     params: data
   })
 }
+
+// 根据分公司Sid获取分公司下所有的部门
+export function getListDeptByOrgSid(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
+    method: 'GET'
+  })
+}
+
+// 根据当前用户orgSidPath的管理层级获取相应的信息（集团获取所有分公司信息、事业部获取旗下的分公司信息、分公司获取该分公司的信息）
+export function selectOrgByLevel(data) {
+  return request({
+    url: '/base/v1/basevehicleout/selectOrgByLevel',
+    method: 'post',
+    params: data
+  })
+}

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -171,21 +171,6 @@ const codemenu = [
       meta: { title: '开票信息管理', noCache: true }
     }]
   },
-  // 开票信息维护
-  {
-    path: '/billinginformation',
-    component: Layout,
-    redirect: '/billinginformation',
-    meta: {
-      title: '开票信息维护'
-    },
-    children: [{
-      path: '/billinginformation/kaipiaoxinxiweihu',
-      component: () => import('@/views/anruifinmanagement/billinginformation/kaipiaoxinxiweihu/kaipiaoxinxiweihu.vue'),
-      name: 'kaipiaoxinxiweihu',
-      meta: { title: '开票信息维护', noCache: true }
-    }]
-  },
   // 费用申请管理编辑
   {
     path: '/feiyongguanliFlow/feiyongguanli/feiyongEdit',

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue

@@ -20,13 +20,23 @@
             <el-col :span="4" class="tleftb">
               <span>分公司</span>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="8">
               <el-form-item>
                 <el-select v-model="formobj.useOrgName" placeholder="请选择" clearable filterable @change="changeOrg">
                   <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>采购系统</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" clearable filterable @change="changeOrgDept">
+                  <el-option v-for="item in orgDept_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
@@ -85,7 +95,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/billinginformation'
-import { getListOrg, typeValues } from '@/api/jichuxinxi/dictcommons'
+import { selectOrgByLevel, typeValues, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
 
 export default {
   name: 'kaipiaoxinxiAdd',
@@ -95,6 +105,7 @@ export default {
       index: 0,
       tableKey: 0,
       org_list: [],
+      orgDept_list: [],
       bank_list: [],
       // 表单数据
       formobj: {
@@ -106,7 +117,9 @@ export default {
         phone: '',
         taxpayerNo: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        purchaseSystemName: '',
+        purchaseSystemSid: ''
       },
       rules: {},
       submitdisabled: false
@@ -119,7 +132,7 @@ export default {
           this.bank_list = res.data
         }
       })
-      getListOrg().then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }
@@ -140,7 +153,14 @@ export default {
       this.viewTitle = '【编辑】开票信息'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+          getListDeptByOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -148,6 +168,15 @@ export default {
     changeOrg(value) {
       const choose = this.org_list.filter((item) => item.name === value)
       this.formobj.useOrgSid = choose[0].sid
+      getListDeptByOrgSid(choose[0].sid).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
+    changeOrgDept(value) {
+      const choose = this.orgDept_list.filter((item) => item.name === value)
+      this.formobj.purchaseSystemSid = choose[0].sid
     },
     save() {
       this.$refs['form_obj'].validate((valid) => {
@@ -181,7 +210,9 @@ export default {
         phone: '',
         taxpayerNo: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        purchaseSystemName: '',
+        purchaseSystemSid: ''
       }
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaixiaoxinxiguanli.vue

@@ -9,10 +9,15 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="分公司名称">
-                <el-select v-model="listQuery.params.useOrgSid" placeholder="请选择" clearable filterable>
+                <el-select v-model="listQuery.params.useOrgSid" placeholder="请选择" clearable filterable @change="changeUseOrg">
                   <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="采购系统">
+                <el-select v-model="listQuery.params.purchaseSystemSid" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in orgDept_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -33,7 +38,12 @@
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="名称" align="center" width="140">
+            <el-table-column label="采购系统" align="center" width="140">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseSystemName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分公司全称" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.name }}</span>
               </template>
@@ -81,7 +91,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import kaipiaoxinxiAdd from './kaipiaoxinxiAdd.vue'
-import { getListOrg } from '@/api/jichuxinxi/dictcommons'
+import { selectOrgByLevel, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
 
 export default {
   name: 'kaipiaoxinxiguanli',
@@ -125,11 +135,14 @@ export default {
       list: [],
       sids: [],
       org_list: [],
+      orgDept_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
         params: {
-          useOrgSid: ''
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemSid: ''
         },
         current: 1,
         size: 5,
@@ -148,7 +161,7 @@ export default {
   },
   methods: {
     init() {
-      getListOrg().then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }
@@ -196,6 +209,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -215,7 +229,9 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          useOrgSid: ''
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemSid: ''
         },
         current: 1,
         size: 5,
@@ -223,6 +239,13 @@ export default {
       }
       this.getList()
     },
+    changeUseOrg(value) {
+      getListDeptByOrgSid(value).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
     toAdd() {
       this.viewState = 2
       this.$refs['divAdd'].showAdd()

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiweihu/kaipiaoxinxiweihu.vue

@@ -1,184 +0,0 @@
-<template>
-  <div class="app-container">
-    <div>
-      <!--标题按钮部分开始-->
-      <div class="tab-header webtop">
-        <!--标题-->
-        <div>{{ viewTitle }}</div>
-        <!--start 添加修改按钮-->
-        <div>
-          <el-button type="primary" size="small" @click="save()">保存
-          </el-button>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-        </div>
-      </div>
-      <!--标题按钮部分结束-->
-      <!--Start 新增修改部分-->
-      <div class="listconadd">
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="4" class="tleftb">
-              <span>分公司</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item><span>{{ formobj.useOrgName }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>名称</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item><el-input v-model="formobj.name" clearable placeholder="" style="width: 40%"></el-input></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>纳税人识别号</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 40%"></el-input></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>地址</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>电话</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item><el-input v-model="formobj.phone" clearable placeholder="" class="addinputw"></el-input></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>开户行</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <el-select v-model="formobj.bankName" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>银行账号</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item><el-input v-model="formobj.bankAccount" clearable placeholder="" class="addinputw"></el-input></el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <!--End 添加修改部分-->
-  </div>
-</template>
-
-<script>
-import req from '@/api/anruifinmanagement/billinginformation'
-import { getPathSidByUserSid, fetchBySid, typeValues } from '@/api/jichuxinxi/dictcommons'
-
-export default {
-  name: 'kaipiaoxinxiweihu',
-  data() {
-    return {
-      viewTitle: '',
-      index: 0,
-      tableKey: 0,
-      org_list: [],
-      bank_list: [],
-      // 表单数据
-      formobj: {
-        sid: '', // 一条数据的sid
-        address: '',
-        bankAccount: '',
-        bankName: '',
-        name: '',
-        phone: '',
-        taxpayerNo: '',
-        useOrgName: '',
-        useOrgSid: ''
-      },
-      rules: {}
-    }
-  },
-  created() {
-    this.showAdd()
-  },
-  methods: {
-    init() {
-      typeValues({ type: 'bank' }).then((res) => {
-        if (res.success) {
-          this.bank_list = res.data
-        }
-      })
-    },
-    showAdd() {
-      this.$nextTick(() => {
-        this.init()
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.viewTitle = '【新增】开票信息'
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.formobj.useOrgSid = res.data
-          fetchBySid(res.data).then((resp) => {
-            if (resp.success) {
-              this.formobj.useOrgName = resp.data.name
-            }
-          })
-          req.fetchDetailsByUseOrgSid(res.data).then((response) => {
-            if (response.success) {
-              if (response.data !== null) {
-                this.formobj = response.data
-                this.viewTitle = '【编辑】开票信息'
-              }
-            }
-          })
-        }
-      })
-    },
-    save() {
-      this.$refs['form_obj'].validate((valid) => {
-        if (valid) {
-          req.saveOrUpdate(this.formobj).then((resp) => {
-            if (resp.success) {
-              this.$message({ showClose: true, type: 'success', message: '保存成功' })
-              // this.handleReturn('true')
-            }
-          }).catch(() => {
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    // 返回（===既判断）
-    handleReturn() {
-      // 表单数据
-      this.formobj = {
-        sid: '', // 一条数据的sid
-        address: '',
-        bankAccount: '',
-        bankName: '',
-        name: '',
-        phone: '',
-        taxpayerNo: '',
-        useOrgName: '',
-        useOrgSid: ''
-      }
-      this.$refs['form_obj'].resetFields()
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.go(-1)
-    }
-  }
-}
-</script>
-<style scoped>
-</style>
-

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -47,83 +47,77 @@
           <div class="">
             <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
               <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
-              <el-table-column fixed label="操作" align="center" width="180">
+              <el-table-column fixed label="操作" align="center" width="80">
                 <template slot-scope="scope">
-                  <el-button type="primary" :disabled="!scope.row.showHandle" size="mini" @click="handUpdate(scope.row)">认款</el-button>
                   <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>
-              <el-table-column label="审核状态" align="center" width="120">
+              <el-table-column label="审核状态" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="认款状态" align="center" width="120">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.subscriptionState == 1 ? '未认款' : scope.row.subscriptionState == 2 ? '部分认款' : scope.row.subscriptionState == 3 ? '已认款' : '其他' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="申请部门" align="center" width="150">
+              <el-table-column label="申请部门" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.createDept }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="申请人" align="center" width="130">
+              <el-table-column label="申请人" align="center" width="80">
                 <template slot-scope="scope">
                   <span>{{ scope.row.createByName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="申请日期" align="center" width="120">
+              <el-table-column label="申请日期" align="center" width="100">
                 <template slot-scope="scope">
                   <span>{{ scope.row.createDate }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款银行账号" align="center" width="200">
+              <el-table-column label="收款银行账号" align="center" width="140">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionBankNum }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款银行名称" align="center" width="200">
+              <el-table-column label="收款银行名称" align="center" width="130">
                 <template slot-scope="scope">
                   <span>{{ scope.row.receivingName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款银行" align="center" width="200">
+              <el-table-column label="收款银行" align="center" width="130">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionBank }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款金额" align="center" width="200">
+              <el-table-column label="收款金额" align="center" width="150">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionMoney }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款日期" align="center" width="120">
+              <el-table-column label="收款日期" align="center" width="100">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionDate }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款方式" align="center" width="120">
+              <el-table-column label="收款方式" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionTypeValue }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="付款方" align="center" width="150">
+              <el-table-column label="付款方" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.payerName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="付款账号后4位" align="center" width="200">
+              <el-table-column label="付款账号后4位" align="center" width="130">
                 <template slot-scope="scope">
                   <span>{{ scope.row.payAccount }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="付款银行" align="center" width="200">
+              <el-table-column label="付款银行" align="center" width="100">
                 <template slot-scope="scope">
                   <span>{{ scope.row.payBank }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" align="center" width="300">
+              <el-table-column label="备注" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.remarks }}</span>
                 </template>