Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetware.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+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: BaseManufacturerRetware.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetware <br/>
+ * Description: 厂家退库表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库表", description = "厂家退库表")
+@TableName("base_manufacturer_retware")
+public class BaseManufacturerRetware extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+	@ApiModelProperty("来源")
+    private String source; // 来源
+	@ApiModelProperty("申请人姓名")
+    private String applyName; // 申请人姓名
+	@ApiModelProperty("申请日期")
+    private String appluDate; // 申请日期
+	@ApiModelProperty("车辆台数")
+    private String num; // 车辆台数
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("节点id")
+    private String nodeSid; // 节点id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareDetailsVo.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo <br/>
+ * Description: 厂家退库表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库表 视图数据详情", description = "厂家退库表 视图数据详情")
+public class BaseManufacturerRetwareDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+	@ApiModelProperty("来源")
+    private String source; // 来源
+	@ApiModelProperty("申请人姓名")
+    private String applyName; // 申请人姓名
+	@ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date appluDate; // 申请日期
+	@ApiModelProperty("车辆台数")
+    private String num; // 车辆台数
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("节点id")
+    private String nodeSid; // 节点id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @ApiModelProperty("厂家退库车辆列表")
+    private List<BaseManufacturerRetwareVehDetailsVo> baseManufacturerRetwareVehs;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareDto.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto <br/>
+ * Description: 厂家退库表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库表 数据传输对象", description = "厂家退库表 数据传输对象")
+public class BaseManufacturerRetwareDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+	@ApiModelProperty("来源")
+    private String source; // 来源
+    @ApiModelProperty("创建人sid")
+    @NotBlank(message = "参数错误：createBySid")
+    private String createBySid;
+	@ApiModelProperty("申请人姓名")
+    private String applyName; // 申请人姓名
+	@ApiModelProperty("申请日期")
+    private String appluDate; // 申请日期
+	@ApiModelProperty("车辆台数")
+    private String num; // 车辆台数
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("厂家退库车辆列表")
+    private List<BaseManufacturerRetwareVehDto> baseManufacturerRetwareVehs;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+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: BaseManufacturerRetwareFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign <br/>
+ * Description: 厂家退库表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家退库表")
+@FeignClient(
+        contextId = "anrui-base-BaseManufacturerRetware",
+        name = "anrui-base",
+        path = "v1/basemanufacturerretware",
+        fallback = BaseManufacturerRetwareFeignFallback.class)
+public interface BaseManufacturerRetwareFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseManufacturerRetwareVo>> listPage(@RequestBody PagerQuery<BaseManufacturerRetwareQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseManufacturerRetwareDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseManufacturerRetwareDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+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: BaseManufacturerRetwareFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeignFallback <br/>
+ * Description: 厂家退库表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseManufacturerRetwareFeignFallback implements BaseManufacturerRetwareFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseManufacturerRetwareVo>> listPage(PagerQuery<BaseManufacturerRetwareQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemanufacturerretware/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseManufacturerRetwareDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturerretware/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturerretware/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseManufacturerRetwareDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemanufacturerretware/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareQuery.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+
+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: BaseManufacturerRetwareQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery <br/>
+ * Description: 厂家退库表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库表 查询条件", description = "厂家退库表 查询条件")
+public class BaseManufacturerRetwareQuery implements Query {
+
+	@ApiModelProperty("申请开始日期")
+    private String appluStartDate; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String appluEndDate; // 申请结束日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareVo.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretware;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo <br/>
+ * Description: 厂家退库表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库表 视图数据对象", description = "厂家退库表 视图数据对象")
+public class BaseManufacturerRetwareVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+	@ApiModelProperty("来源")
+    private String source; // 来源
+	@ApiModelProperty("申请人姓名")
+    private String applyName; // 申请人姓名
+	@ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date appluDate; // 申请日期
+	@ApiModelProperty("车辆台数")
+    private String num; // 车辆台数
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVeh.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+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: BaseManufacturerRetwareVeh.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVeh <br/>
+ * Description: 厂家退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库车辆表", description = "厂家退库车辆表")
+@TableName("base_manufacturer_retware_veh")
+public class BaseManufacturerRetwareVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("厂商退库sid")
+    private String mainSid; // 厂商退库sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家审批结果(0成功，1失败)")
+    private String manApprovalType; // 厂家审批结果(0成功，1失败)
+	@ApiModelProperty("退款金额")
+    private String refundMoney; // 退款金额
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehVo <br/>
+ * Description: 厂家退库车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库车辆表 视图数据详情", description = "厂家退库车辆表 视图数据详情")
+public class BaseManufacturerRetwareVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("厂商退库sid")
+    private String mainSid; // 厂商退库sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家审批结果(0成功，1失败)")
+    private String manApprovalType; // 厂家审批结果(0成功，1失败)
+	@ApiModelProperty("退款金额")
+    private String refundMoney; // 退款金额
+    @ApiModelProperty("图片全路径")
+    private List<String> urls; // 图片全路径
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+
+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: BaseManufacturerRetwareVehDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto <br/>
+ * Description: 厂家退库车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库车辆表 数据传输对象", description = "厂家退库车辆表 数据传输对象")
+public class BaseManufacturerRetwareVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("厂商退库sid")
+    private String mainSid; // 厂商退库sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家审批结果(0成功，1失败)")
+    private String manApprovalType; // 厂家审批结果(0成功，1失败)
+	@ApiModelProperty("退款金额")
+    private String refundMoney; // 退款金额
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+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: BaseManufacturerRetwareVehFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehFeign <br/>
+ * Description: 厂家退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家退库车辆表")
+@FeignClient(
+        contextId = "anrui-base-BaseManufacturerRetwareVeh",
+        name = "anrui-base",
+        path = "v1/basemanufacturerretwareveh",
+        fallback = BaseManufacturerRetwareVehFeignFallback.class)
+public interface BaseManufacturerRetwareVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseManufacturerRetwareVehVo>> listPage(@RequestBody PagerQuery<BaseManufacturerRetwareVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseManufacturerRetwareVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseManufacturerRetwareVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+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: BaseManufacturerRetwareVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehFeignFallback <br/>
+ * Description: 厂家退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseManufacturerRetwareVehFeignFallback implements BaseManufacturerRetwareVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseManufacturerRetwareVehVo>> listPage(PagerQuery<BaseManufacturerRetwareVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemanufacturerretwareveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseManufacturerRetwareVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturerretwareveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturerretwareveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseManufacturerRetwareVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemanufacturerretwareveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+
+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: BaseManufacturerRetwareVehQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehQuery <br/>
+ * Description: 厂家退库车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库车辆表 查询条件", description = "厂家退库车辆表 查询条件")
+public class BaseManufacturerRetwareVehQuery implements Query {
+
+	@ApiModelProperty("厂商退库sid")
+    private String mainSid; // 厂商退库sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家审批结果(0成功，1失败)")
+    private String manApprovalType; // 厂家审批结果(0成功，1失败)
+	@ApiModelProperty("退款金额")
+    private String refundMoney; // 退款金额
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemanufacturerretwareveh;
+
+
+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: BaseManufacturerRetwareVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehVo <br/>
+ * Description: 厂家退库车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家退库车辆表 视图数据对象", description = "厂家退库车辆表 视图数据对象")
+public class BaseManufacturerRetwareVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("厂商退库sid")
+    private String mainSid; // 厂商退库sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家审批结果(0成功，1失败)")
+    private String manApprovalType; // 厂家审批结果(0成功，1失败)
+	@ApiModelProperty("退款金额")
+    private String refundMoney; // 退款金额
+
+}

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

@@ -12,6 +12,7 @@ public enum BillTypeEnum {
     PCSQ("PCSQ", "排产申请"),
     RZSQ("RZSQ", "入账申请"),
     NGSQ("NGSQ", "内购申请"),
+    CJTKSQ("CJTKSQ", "厂家退库申请"),
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareMapper.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretware;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetware;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareMapper <br/>
+ * Description: 厂家退库表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseManufacturerRetwareMapper extends BaseMapper<BaseManufacturerRetware> {
+
+	//@Update("update base_manufacturer_retware set name=#{msg} where id=#{id}")
+	//IPage<BaseManufacturerRetwareVo> voPage(IPage<BaseManufacturerRetware> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufacturerRetware> qw);
+	
+	IPage<BaseManufacturerRetwareVo> selectPageVo(IPage<BaseManufacturerRetware> page, @Param(Constants.WRAPPER) Wrapper<BaseManufacturerRetware> qw);
+	
+	List<BaseManufacturerRetwareVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseManufacturerRetware> qw);
+	
+	@Select("select * from base_manufacturer_retware")
+	List<BaseManufacturerRetwareVo> selectListVo();
+
+    int selectNum(String bill);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareMapper.xml

@@ -0,0 +1,19 @@
+<?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.basemanufacturerretware.BaseManufacturerRetwareMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo">
+		SELECT * FROM base_manufacturer_retware <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo">
+		SELECT * FROM base_manufacturer_retware <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectNum" resultType="int">
+		select count(*)
+		from base_manufacturer_retware
+		where applyNo LIKE concat(#{bill}, '%')
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretware;
+
+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.basemanufacturerretware.BaseManufacturerRetware;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest <br/>
+ * Description: 厂家退库表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家退库表")
+@RestController("com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest")
+@RequestMapping("v1/basemanufacturerretware")
+public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign {
+
+	@Autowired
+	private BaseManufacturerRetwareService baseManufacturerRetwareService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseManufacturerRetwareVo>> listPage(@RequestBody PagerQuery<BaseManufacturerRetwareQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseManufacturerRetwareVo> pv = baseManufacturerRetwareService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseManufacturerRetwareDto dto){
+		return baseManufacturerRetwareService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return baseManufacturerRetwareService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseManufacturerRetwareDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return baseManufacturerRetwareService.fetchAll(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -0,0 +1,208 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretware;
+
+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.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
+import com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+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.basemanufacturerretware.BaseManufacturerRetware;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto;
+import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareService <br/>
+ * Description: 厂家退库表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManufacturerRetwareMapper, BaseManufacturerRetware> {
+
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private BaseManufacturerRetwareVehService baseManufacturerRetwareVehService;
+
+	private QueryWrapper<BaseManufacturerRetware> createQueryWrapper(BaseManufacturerRetwareQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseManufacturerRetware> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseManufacturerRetwareVo> listPageVo(PagerQuery<BaseManufacturerRetwareQuery> pq) {
+		BaseManufacturerRetwareQuery query = pq.getParams();
+		QueryWrapper<BaseManufacturerRetware> qw = new QueryWrapper<>();
+		qw.eq("createOrgSid",query.getCreateOrgSid());
+		qw.eq("nodeState",query.getNodeState());
+		String appluStartDate = query.getAppluStartDate();
+		String appluEndDate = query.getAppluEndDate();
+		qw.apply(StringUtils.isNotEmpty(appluStartDate), "date_format (appluDate,'%Y-%m-%d') >= date_format('" + appluStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(appluEndDate), "date_format (appluDate,'%Y-%m-%d') <= date_format('" + appluEndDate + "','%Y-%m-%d')"
+				);
+		IPage<BaseManufacturerRetware> page = PagerUtil.queryToPage(pq);
+		IPage<BaseManufacturerRetwareVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseManufacturerRetwareVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public ResultBean saveOrUpdateDto(BaseManufacturerRetwareDto dto){
+		ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+		List<BaseManufacturerRetwareVehDto> baseManufacturerRetwareVehs = dto.getBaseManufacturerRetwareVehs();
+		if (StringUtils.isBlank(dtoSid)) {//新增
+			BaseManufacturerRetware baseManufacturerRetware = new BaseManufacturerRetware();
+			String sid = baseManufacturerRetware.getSid();
+			BeanUtil.copyProperties(dto,baseManufacturerRetware);
+			baseManufacturerRetware.setSid(sid);
+			//申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
+			//获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
+			String billNo = getApplyCode(dto);
+			baseManufacturerRetware.setApplyNo(billNo);
+			baseManufacturerRetware.setAppluDate(DateUtil.today());
+			save(baseManufacturerRetware);
+			for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
+				BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
+				String sid1 = baseManufacturerRetwareVeh1.getSid();
+				BeanUtil.copyProperties(baseManufacturerRetware,baseManufacturerRetwareVeh1);
+				baseManufacturerRetwareVeh1.setSid(sid1);
+				baseManufacturerRetwareVeh1.setMainSid(sid);
+				baseManufacturerRetwareVehService.save(baseManufacturerRetwareVeh1);
+			}
+			return rb.success().setMsg("保存成功");
+        }
+		BaseManufacturerRetware baseManufacturerRetware = fetchBySid(dtoSid);
+		if (baseManufacturerRetware == null){
+			return rb.setMsg("该厂家退库单不存在");
+		}
+		this.updateByDto(dto);
+		baseManufacturerRetwareVehService.delByMainSid(dtoSid);
+		for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
+			BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
+			String sid1 = baseManufacturerRetwareVeh1.getSid();
+			BeanUtil.copyProperties(baseManufacturerRetware,baseManufacturerRetwareVeh1);
+			baseManufacturerRetwareVeh1.setSid(sid1);
+			baseManufacturerRetwareVeh1.setMainSid(dtoSid);
+			baseManufacturerRetwareVehService.save(baseManufacturerRetwareVeh1);
+		}
+		return rb.success().setMsg("修改成功");
+	}
+
+	public String getApplyCode(BaseManufacturerRetwareDto dto) {
+		String userSid = dto.getCreateBySid();
+		//获取分公司sid
+		ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+		ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+		String orgCode = resultBean1.getData().getOrgCode();
+		BillNo b = new BillNo();
+		b.setOrgCode(orgCode);
+		b.setBillType(BillTypeEnum.CJTKSQ.getBillType());
+		String bill = Rule.getBill(b);
+		int i = baseMapper.selectNum(bill);
+		String billNo = Rule.getBillNo(bill, i);
+		return billNo;
+	}
+	
+	public void insertByDto(BaseManufacturerRetwareDto dto){
+		BaseManufacturerRetware entity = new BaseManufacturerRetware();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseManufacturerRetwareDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseManufacturerRetware entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseManufacturerRetwareDetailsVo fetchDetailsVoBySid(String sid){
+		BaseManufacturerRetware entity = fetchBySid(sid);
+		BaseManufacturerRetwareDetailsVo vo = new BaseManufacturerRetwareDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		delBySids(sids);
+		for (String sid : sids) {
+			baseManufacturerRetwareVehService.delByMainSid(sid);
+		}
+		return rb.success().setMsg("删除成功");
+	}
+
+	public ResultBean<BaseManufacturerRetwareDetailsVo> fetchAll(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		BaseManufacturerRetwareDetailsVo baseManufacturerRetwareDetailsVo = new BaseManufacturerRetwareDetailsVo();
+		BaseManufacturerRetware baseManufacturerRetware = fetchBySid(sid);
+		if (baseManufacturerRetware == null){
+			rb.setMsg("该厂家退库单不存在");
+		}
+		BeanUtil.copyProperties(baseManufacturerRetware,baseManufacturerRetwareDetailsVo);
+		List<BaseManufacturerRetwareVehDetailsVo> baseManufacturerRetwareVehDetailsVos = baseManufacturerRetwareVehService.fetchByMainSid(sid);
+		baseManufacturerRetwareDetailsVo.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehDetailsVos);
+		return rb.success().setData(baseManufacturerRetwareDetailsVo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretwareveh;
+
+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.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVehMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehMapper <br/>
+ * Description: 厂家退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseManufacturerRetwareVehMapper extends BaseMapper<BaseManufacturerRetwareVeh> {
+
+	//@Update("update base_manufacturer_retware_veh set name=#{msg} where id=#{id}")
+	//IPage<BaseManufacturerRetwareVehVo> voPage(IPage<BaseManufacturerRetwareVeh> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufacturerRetwareVeh> qw);
+	
+	IPage<BaseManufacturerRetwareVehVo> selectPageVo(IPage<BaseManufacturerRetwareVeh> page, @Param(Constants.WRAPPER) Wrapper<BaseManufacturerRetwareVeh> qw);
+	
+	List<BaseManufacturerRetwareVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseManufacturerRetwareVeh> qw);
+	
+	@Select("select * from base_manufacturer_retware_veh")
+	List<BaseManufacturerRetwareVehVo> selectListVo();
+
+	@Delete("delete from base_manufacturer_retware_veh where mainSid = #{dtoSid}")
+    int delByMainSid(String dtoSid);
+
+	@Select("select * from base_manufacturer_retware_veh where mainSid = #{sid}")
+	List<BaseManufacturerRetwareVehDetailsVo> fetchByMainSid(String sid);
+}

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

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretwareveh;
+
+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.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehQuery;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehFeign;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehRest <br/>
+ * Description: 厂家退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家退库车辆表")
+@RestController("com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehRest")
+@RequestMapping("v1/basemanufacturerretwareveh")
+public class BaseManufacturerRetwareVehRest implements BaseManufacturerRetwareVehFeign {
+
+	@Autowired
+	private BaseManufacturerRetwareVehService baseManufacturerRetwareVehService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseManufacturerRetwareVehVo>> listPage(@RequestBody PagerQuery<BaseManufacturerRetwareVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseManufacturerRetwareVehVo> pv = baseManufacturerRetwareVehService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseManufacturerRetwareVehDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseManufacturerRetwareVehService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseManufacturerRetwareVehService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseManufacturerRetwareVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseManufacturerRetwareVehDetailsVo vo = baseManufacturerRetwareVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java

@@ -0,0 +1,141 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemanufacturerretwareveh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.common.base.config.component.FileUploadComponent;
+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.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehQuery;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-base(厂家退库) <br/>
+ * File: BaseManufacturerRetwareVehService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService <br/>
+ * Description: 厂家退库车辆表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-05 17:02:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseManufacturerRetwareVehService extends MybatisBaseService<BaseManufacturerRetwareVehMapper, BaseManufacturerRetwareVeh> {
+	
+	@Autowired
+	private CommonAppendixService commonAppendixService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	
+	private QueryWrapper<BaseManufacturerRetwareVeh> createQueryWrapper(BaseManufacturerRetwareVehQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseManufacturerRetwareVeh> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseManufacturerRetwareVehVo> listPageVo(PagerQuery<BaseManufacturerRetwareVehQuery> pq) {
+		BaseManufacturerRetwareVehQuery query = pq.getParams();
+		QueryWrapper<BaseManufacturerRetwareVeh> qw = createQueryWrapper(query);
+		IPage<BaseManufacturerRetwareVeh> page = PagerUtil.queryToPage(pq);
+		IPage<BaseManufacturerRetwareVehVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseManufacturerRetwareVehVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseManufacturerRetwareVehDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseManufacturerRetwareVehDto dto){
+		BaseManufacturerRetwareVeh entity = new BaseManufacturerRetwareVeh();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseManufacturerRetwareVehDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseManufacturerRetwareVeh entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseManufacturerRetwareVehDetailsVo fetchDetailsVoBySid(String sid){
+		BaseManufacturerRetwareVeh entity = fetchBySid(sid);
+		BaseManufacturerRetwareVehDetailsVo vo = new BaseManufacturerRetwareVehDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public int delByMainSid(String dtoSid) {
+		return baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<BaseManufacturerRetwareVehDetailsVo> fetchByMainSid(String sid) {
+		List<BaseManufacturerRetwareVehDetailsVo> baseManufacturerRetwareVehDetailsVos = baseMapper.fetchByMainSid(sid);
+		for (BaseManufacturerRetwareVehDetailsVo baseManufacturerRetwareVehDetailsVo : baseManufacturerRetwareVehDetailsVos) {
+			List<String> stringList = new ArrayList<>();
+			List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(baseManufacturerRetwareVehDetailsVo.getSid());
+			for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+				String filePath = commonAppendixVo.getFilePath();
+				String urlPrefix = fileUploadComponent.getUrlPrefix();
+				filePath = urlPrefix + filePath;
+				stringList.add(filePath);
+				baseManufacturerRetwareVehDetailsVo.setUrls(stringList);
+			}
+		}
+		return baseManufacturerRetwareVehDetailsVos;
+	}
+}

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

@@ -290,12 +290,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();
         String orgSidPath = sysStaffOrg.getOrgSidPath();
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
-
         String busSid = dto.getBusinessSid();
         if (StringUtils.isBlank(busSid)) {
-
             ResultBean resultBean = saveOrUpdateDto(dto);//insert
-
             String businessSid = resultBean.getData().toString();
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(dto, bv);
@@ -314,16 +311,15 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
         }
+        ResultBean rb = submitBusinessData(dto, busSid,orgSidPath);
+        return rb;
+    }
 
-
-        BaseOutsourcingApplicationDto booad = new BaseOutsourcingApplicationDto();
-        int r = submitBusinessData(dto, busSid, booad);
-        if (r == 0) {
-            return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
-        }
-
-        ResultBean resultBean = saveOrUpdateDto(dto);//update
-        String businessSid = resultBean.getData().toString();
+    private synchronized ResultBean submitBusinessData(SubmitBaseOutSourcingApplicationDto dto,
+                                                       String businessSid,String orgSidPath) {
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        BaseOutsourcingApplicationDto booad = baseMapper.getBySid(businessSid);
+        String businessTaskid = booad.getTaskId();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
         bv.setOrgSidPath(orgSidPath);
@@ -332,38 +328,25 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         variables.put("businessSid", businessSid);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
-        //如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么  如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
-        // 应该是也不允许走if 也不运行走else  那应该如何验证这个id是否允许走else呢？
-        // 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
-
-        if (r == 1) {
+        if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
+            // 新提交 taskid都是空的
+              saveOrUpdateDto(dto);//update
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
-        } else if (r == 2) {
+        } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
             bv.setTaskDefKey(booad.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
-        }
-        return  ResultBean.fireFail();
-    }
-
-    private synchronized int submitBusinessData(SubmitBaseOutSourcingApplicationDto dto,
-                                                String businessSid, BaseOutsourcingApplicationDto booad) {
-        int r = 0;
-        booad = baseMapper.getBySid(businessSid);
-        String businessTaskid = booad.getTaskId();
-        if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
-            // 新提交 taskid都是空的
-            r = 1;
-        } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
-            r = 2;
+            ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
+            Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
+            updateFlowFiled(stringObjectMap);
+            return rb;
+        }else{
+            return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
         }
-        return r;
     }
-
     /**
      * 检查用户是否设置部门
      *
@@ -379,33 +362,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         return orgSid;
     }
 
-    /**
-     * 保存流程业务关联表 数据
-     *
-     * @param map
-     */
-    private void saveSysFormLink(Map<String, String> map) {
-        String sid = map.get("sid");
-        ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid);
-        if (!resultBean.getSuccess()) { // 新增
-            SysFormLinkDto sysFormLinkDto = new SysFormLinkDto();
-            sysFormLinkDto.setBusinessSid(map.get("sid"));
-            sysFormLinkDto.setProcInsId(map.get("procInsId"));
-            sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
-            sysFormLinkDto.setNodeState(map.get("nodeState"));
-            sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
-            sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
-            sysFormLinkFeign.save(sysFormLinkDto);
-        } else { // 更新
-            Map<String, Object> updateMap = new HashMap<>();
-            updateMap.put("businessSid", sid);
-            updateMap.put("nodeState", map.get("nodeState"));
-            updateMap.put("taskDefKey", map.get("taskDefKey"));
-            updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
-            sysFormLinkFeign.updateFiled(updateMap);
-        }
-    }
-
     /**
      * 办理
      *

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -130,6 +130,10 @@ public class FlowableRest implements FlowableFeign {
         if(o==null){
             return rb.setMsg("流程设计问题");
         }
+        return getNextUserSids(rb, orgSidPath, o);
+    }
+
+    private ResultBean getNextUserSids(ResultBean rb, String orgSidPath, Object o) {
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o));
         String roleSid = jsonArray.get(0).toString();
         //根据组织架构、角色两个参数取相关符合条件的用户信息
@@ -174,7 +178,9 @@ public class FlowableRest implements FlowableFeign {
             task_map.put("name","结束");
             return rb.setData("");
         }else{
-            //如果不是最后一个环节 要取下一个环节的角色sid
+            Object o = task_map.get("candidateGroups");
+            return getNextUserSids(rb, orgSidPath, o);
+           /* //如果不是最后一个环节 要取下一个环节的角色sid
             List<String> candidateGroups= (List<String>) task_map.get("candidateGroups");
             String roleSid=candidateGroups.get(0);
             //根据组织架构、角色两个参数取相关符合条件的用户信息
@@ -182,14 +188,19 @@ public class FlowableRest implements FlowableFeign {
             userQuery.setRoleSid(roleSid);
             userQuery.setOrgSidPath(orgSidPath);
             List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+            if(sysUserVos==null||sysUserVos.size()<1){
+                return rb.setMsg("环节没有用户");
+            }
             StringBuilder nextNodeUserSids = new StringBuilder();
             for (SysUserVo su : sysUserVos) {
                nextNodeUserSids.append(su.getSid()).append(",");
             }
             //符合条件的用户的sid,拼接的字符串
             String nextNodeUserSids_ = nextNodeUserSids.toString();
+            if(StringUtils.isBlank(nextNodeUserSids_))
+                return   rb.setMsg("环节没有用户");
             nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
-            return rb.setData(nextNodeUserSids_);
+            return rb.setData(nextNodeUserSids_);*/
         }
     }
 

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

@@ -1246,6 +1246,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskId(flowTaskVo.getTaskId()).singleResult();
         Execution execution = runtimeService.createExecutionQuery().executionId(historicTaskInstance.getExecutionId()).singleResult();
         DelegateExecution delegateExecution = (DelegateExecution) execution;
+        if(delegateExecution==null){
+            return new ResultBean<List<LatestTaskVo>>().fail().setMsg("流程已办结，不能撤回！").setData(new ArrayList<>());
+        }
         // 获取当前节点的activityId,即xml中每个标签的ID
         String currentActivityId = delegateExecution.getCurrentActivityId();
         // List<Task> list1 = taskService.createTaskQuery().processInstanceId(historicTaskInstance.getProcessInstanceId()).list();

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@@ -24,5 +24,8 @@ public class ScmVehicleReturn extends BaseEntity {
     private BigDecimal money;
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
-
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
+    @ApiModelProperty(value = "taskDefKey")
+    private String taskDefKey;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -55,4 +55,6 @@ public class ScmVehicleReturnDto implements Dto {
     private String businessSid;
     @ApiModelProperty("comment")
     private String comment;
+    @ApiModelProperty(value = "procInsId")
+    private String procInsId;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml

@@ -16,14 +16,14 @@
 
 	<update id="updateFlowFiled" parameterType="java.util.Map">
 		UPDATE scm_apply_inbound
-		SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}
+		SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}, taskId=#{taskId}
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>
 		<if test="procInsId != null and procInsId != ''">
 			, procInsId=#{procInsId}
 		</if>
-		WHERE sid=#{sid}
+		 WHERE sid=#{sid}
 	</update>
 
 	<select id="selectNum" resultType="int">

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -23,6 +23,7 @@ import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
+import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
 import com.yxt.anrui.scm.biz.flow.FlowableService;
 import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
 import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService;
@@ -241,7 +242,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         // }
         return baseMapper.update(null, uw);
     }
-
     /**
      * 提交入账申请
      *
@@ -249,54 +249,58 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
      * @return
      */
     public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        //取组织架构的全路径sid
-        // SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getUserSid()).getData();
-        String orgSidPath = dto.getOrgSidPath(); //sysStaffOrg.getOrgSidPath();
-        Map<String, Object> variables = BeanUtil.beanToMap(dto);
-
-        ScmApplyInbound booad = new ScmApplyInbound();
-        int r = submitBusinessData(dto, booad);
-        if (r == 0) {
-            return rb.setMsg("操作失败，提交的数据不一致!");
+        String orgSidPath = dto.getOrgSidPath();
+        String busSid = dto.getBusinessSid();
+        if (StringUtils.isBlank(busSid)) {
+            Map<String, Object> variables = BeanUtil.beanToMap(dto);
+            ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert
+            String businessSid = resultBean.getData().toString();
+            BusinessVariables bv = new BusinessVariables();
+            BeanUtil.copyProperties(dto, bv);
+            bv.setOrgSidPath(orgSidPath);
+            bv.setBusinessSid(businessSid);
+            bv.setUserSid(dto.getUserSid());
+            variables.put("businessSid", businessSid);
+            bv.setFormVariables(variables);
+            bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId());
+            ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo uff = resultBean1.getData();
+            updateFlowFiled(BeanUtil.beanToMap(uff));
+            return resultBean1;
         }
+        return submitBusinessData(dto, busSid,orgSidPath);
+    }
 
-        ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
-        String businessSid = resultBean.getData();
+    private synchronized ResultBean submitBusinessData(SubmitScmApplyInboundDto dto,String businessSid,String orgSidPath) {
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        ScmApplyInbound entity = this.fetchBySid(dto.getSid());
+        String businessTaskid = entity.getTaskId();
         BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(dto, bv);
         bv.setOrgSidPath(orgSidPath);
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getUserSid());
         variables.put("businessSid", businessSid);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId());
-        if (r == 1) {
+        if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
+            saveOrUpdateApplyInBound(dto);
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
-            updateFlowFiled(uff);
+            updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
-        } else if (r == 2) {
-            bv.setTaskDefKey(booad.getTaskDefKey());
+        } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
+            saveOrUpdateApplyInBound(dto);
+            bv.setTaskDefKey(entity.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
-            bv.setInstanceId(booad.getProcInsId());
+            bv.setInstanceId(dto.getProcInsId());
+            bv.setTaskId(dto.getTaskId());
             ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv);
             updateFlowFiled(rrb.getData());
             return rrb;
+        }else{
+            return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
         }
-        return rb;
-    }
-
-    private synchronized int submitBusinessData(SubmitScmApplyInboundDto dto, ScmApplyInbound booad) {
-        int r = 0;
-        booad = this.fetchBySid(dto.getSid());
-        String businessTaskid = booad.getTaskId();
-        if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
-            // 新提交 taskid都是空的
-            r = 1;
-        } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
-            r = 2;
-        }
-        return r;
     }
 
     /**
@@ -312,7 +316,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(booad.getTaskId()) || !booad.getTaskId().equals(dto.getTaskId())) {
             return rb.setMsg("操作失败，提交的数据不一致!");
         }
-
         //取组织架构的全路径sid
         // SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getApplicationSid()).getData();
         String orgSidPath = dto.getOrgSidPath();
@@ -331,8 +334,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv);
         String taskDefKey = rrb.getData().getTaskDefKey();
         updateFlowFiled(rrb.getData());
-        if("Event_end".equals(taskDefKey)){
 
+        if("Event_end".equals(taskDefKey)){
             List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
             for(ScmApplyInboundVehicleDto scmApplyInboundVehicleDto:vehicleList){
                 ScmEntryVehicleExamineDto scmEntryVehicleExamineDto=new ScmEntryVehicleExamineDto();
@@ -377,6 +380,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("sid", businessSid);
+        paramMap.put("taskId", resultBean.getData().get(0).getId_());
         if (incomingSourceRef.contains("start")) {
             paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
             paramMap.put("taskDefKey", taskDefKey);
@@ -408,6 +412,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("sid", businessSid);
+        paramMap.put("taskId", resultBean.getData().get(0).getId_());
         paramMap.put("nodeState", nodeState);
         paramMap.put("taskDefKey", taskDefKey);
         if (incomingSourceRef.contains("start")) {
@@ -433,7 +438,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         }
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("sid", businessSid);
-        paramMap.put("nodeState", String.valueOf(resultBean.getData()));
+        paramMap.put("nodeState", "已终止");
         paramMap.put("taskDefKey", "Event_end");
         paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
         updateFlowFiled(paramMap);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -205,7 +205,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         String busSid = scmVehicleReturnDto.getBusinessSid();
         if (org.apache.commons.lang3.StringUtils.isBlank(busSid)) {
             ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);
-           // ResultBean resultBean = saveOrUpdateDto(dto);//insert
             String businessSid = resultBean.getData().toString();
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(scmVehicleReturnDto, bv);
@@ -223,115 +222,40 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
         }
-        Map<String,Object> mm= submitBusinessData(scmVehicleReturnDto, busSid);
-        int r=(int)mm.get("r");
-        ScmVehicleReturnDto booad = (ScmVehicleReturnDto) mm.get("bean");
-        if (r == 0) {
-            return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
-        }
+        return submitBusinessData(scmVehicleReturnDto, busSid,orgSidPath,variables);
+    }
 
-        ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);//update
-        String businessSid = resultBean.getData().toString();
+    private synchronized ResultBean submitBusinessData(ScmVehicleReturnDto dto,
+                                                String businessSid ,String orgSidPath,
+                                                       Map<String, Object> variables) {
+        ScmVehicleReturnDto booad = baseMapper.getBySid(businessSid);
+        String businessTaskid = booad.getTaskId();
         BusinessVariables bv = new BusinessVariables();
-        BeanUtil.copyProperties(scmVehicleReturnDto, bv);
+        BeanUtil.copyProperties(dto, bv);
         bv.setOrgSidPath(orgSidPath);
         bv.setBusinessSid(businessSid);
-        bv.setUserSid(scmVehicleReturnDto.getUserSid());
+        bv.setUserSid(dto.getUserSid());
         variables.put("businessSid", businessSid);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
-        //如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么  如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
-        // 应该是也不允许走if 也不运行走else  那应该如何验证这个id是否允许走else呢？
-        // 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
-
-        if (r == 1) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(businessTaskid) && org.apache.commons.lang3.StringUtils.isBlank(dto.getTaskId())) {
+            saveOrUpdateVehicleReturn(dto);//update
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
-        } else if (r == 2) {
+        } else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
+            saveOrUpdateVehicleReturn(dto);//update
             bv.setTaskDefKey(booad.getTaskDefKey());
-            bv.setComment(org.apache.commons.lang3.StringUtils.isNotBlank(scmVehicleReturnDto.getComment()) ? scmVehicleReturnDto.getComment() : "重新提交");
+            bv.setComment(org.apache.commons.lang3.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(booad.getInstanceId());
-            return complete(bv);
-        }
-        return  ResultBean.fireFail();/*
-        if (resultBean.getSuccess()) {
-            String businessSid = resultBean.getData().toString();
-            //判断车辆的状态是否包含采购退库的状态，如果是的话，返回审核失败
-            ResultBean<List<String>> vinNoList1 = scmVehicleReturnDetailsService.selectVinNoList(businessSid);
-            if (vinNoList1.getSuccess() && vinNoList1.getData() != null && vinNoList1.getData().size() != 0) {
-                //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
-                ResultBean<Boolean> stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData());
-                if (stringResultBean.getSuccess()) {
-                    if (stringResultBean.getData()) {
-                        return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
-                    }
-                }
-            }
-            variables.put("businessSid", businessSid);
-            if (Integer.parseInt(scmVehicleReturnDto.getMoney()) > 0) {
-                variables.put("isLoan", true);
-            } else {
-                variables.put("isLoan", false);
-            }
-            variables.put("orgSid", orgSid);//部门sid
-            BusinessVariables bv = new BusinessVariables();
-            BeanUtil.copyProperties(scmVehicleReturnDto, bv);
-            bv.setOrgSidPath(orgSidPath);
-            bv.setBusinessSid(businessSid);
-            bv.setUserSid(scmVehicleReturnDto.getUserSid());
-            variables.put("businessSid", businessSid);
-            bv.setFormVariables(variables);
-            bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
-            ResultBean<UpdateFlowFieldVo> businessResultBean =flowableFeign.startProcess(bv);//flowableFeign.businessStart(bv);
-            if (businessResultBean.getSuccess() && businessResultBean.getData() != null) {
-                UpdateFlowFieldVo uff = businessResultBean.getData();
-                updateFlowFiled(BeanUtil.beanToMap(uff));
-            } else {
-                return rb.setMsg(businessResultBean.getMsg());
-            }
-        } else {
-            return rb.setMsg(resultBean.getMsg());
-        }
-
-        return resultBean;*/
-    }
-
-    private synchronized Map<String,Object>  submitBusinessData(ScmVehicleReturnDto dto,
-                                                String businessSid ) {
-        Map<String,Object> map=new HashMap<>();
-        int r = 0;
-        ScmVehicleReturnDto booad = baseMapper.getBySid(businessSid);
-        String businessTaskid = booad.getTaskId();
-        if (org.apache.commons.lang3.StringUtils.isBlank(businessTaskid) && org.apache.commons.lang3.StringUtils.isBlank(dto.getTaskId())) {
-            // 新提交 taskid都是空的
-            r = 1;
-        } else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
-            r = 2;
-        }
-        map.put("r",r);
-        map.put("bean",booad);
-        return map;
-    }
-    /**
-     * 查询用户是否设置了部门
-     * *
-     *
-     * @param userSid 用户sid
-     * @return
-     */
-    private String checkUserOrg(String userSid) {
-        String orgSid = "";
-        String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
-        ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
-        if (resultBean.getSuccess()) {
-            orgSid = resultBean.getData();
+            ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv);
+            updateFlowFiled(BeanUtil.beanToMap(rrb.getData()));
+            return rrb;
+        }else{
+            return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
         }
-        return orgSid;
     }
-
-
     /**
      * 办理流程
      *
@@ -344,8 +268,12 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         if (isTrue) {
             return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
         }
-        bv.getFormVariables().put("isLoan",true);
-
+        String money=(String)bv.getFormVariables().get("money");
+        if (Integer.parseInt(money) > 0) {
+            bv.getFormVariables().put("isLoan", true);
+        } else {
+            bv.getFormVariables().put("isLoan", false);
+        }
         ScmVehicleReturnDto booad = baseMapper.getBySid(bv.getBusinessSid());
             String businessTaskid = booad.getTaskId();
             if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
@@ -356,7 +284,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             } else {
                 return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
             }
-        }
+    }
 
 
     /**

anrui-scm/anrui-scm-ui/src/api/flow/cunfangdidianbiangeng.js

@@ -37,16 +37,16 @@ export default {
   getNextNodesForSubmit: function(data) {
     return request({
       url: 'scm/v1/scmvehiclegression/getNextNodesForSubmit',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data
     })
   },
   // 审批流程（驳回、终止）获取下一环节
   getPreviousNodesForReject: function(data) {
     return request({
       url: 'scm/v1/scmvehiclegression/getPreviousNodesForReject',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data
     })
   },
   // 读取xml文件

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -528,14 +528,14 @@ const codemenu = [
       import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue'),
     name: 'tiaojiaEdit'
   },
-  // 调价管理详情
+  // 调价管理待办详情
   {
     path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo',
     component: () =>
       import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue'),
     name: 'tiaojiaInfo'
   },
-  // 调价管理详情
+  // 调价管理已办详情
   {
     path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo',
     component: () =>
@@ -549,12 +549,19 @@ const codemenu = [
       import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue'),
     name: 'neigouEdit'
   },
-  // 车辆内购详情
+  // 车辆内购待办详情
   {
-    path: '/cheliangneigouFlow/neigouguanli/neigouInfo',
+    path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo',
     component: () =>
-      import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouInfo.vue'),
-    name: 'neigouInfo'
+      import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'),
+    name: 'neigouDaiBanInfo'
+  },
+  // 车辆内购已办详情
+  {
+    path: '/cheliangneigouFlow/neigouguanli/neigouYiBanInfo',
+    component: () =>
+      import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue'),
+    name: 'neigouYiBanInfo'
   },
   // 未售买断编辑
   {
@@ -563,12 +570,19 @@ const codemenu = [
       import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue'),
     name: 'maiduanEdit'
   },
-  // 未售买断详情
+  // 未售买断待办详情
+  {
+    path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo',
+    component: () =>
+      import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue'),
+    name: 'weishoumaiduanDaiBanInfo'
+  },
+  // 未售买断已办详情
   {
-    path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo',
+    path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo',
     component: () =>
-      import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue'),
-    name: 'maiduanInfo'
+      import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue'),
+    name: 'weishoumaiduanYiBanInfo'
   },
   // 采购退库驳回到发起人办理编辑页面
   {

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue

@@ -58,22 +58,22 @@
               </el-button>
             </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.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center">
+          <el-table-column label="车型" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.modelName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库日期" align="center" width="150">
+          <el-table-column label="入库日期" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库价" align="center" width="200">
+          <el-table-column label="入库价" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundPrice }}</span>
             </template>
@@ -157,15 +157,8 @@ export default {
       this.viewTitle = '【编辑】车辆未售买断申请'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
-        const data = resp.data
-        this.formobj.applicationName = data.applicationName
-        this.formobj.sid = data.sid
-        this.formobj.reason = data.reason
-        this.formobj.createTime = data.createTime
-        this.formobj.instanceId = data.procInstId
-        this.formobj.userSid = data.userSid
-        this.formobj.taskId = data.taskId
-        this.formobj.detailsList = data.voList
+        this.formobj = resp.data
+        this.formobj.instanceId = resp.data.procInstId
       }).catch((e) => {
         this.formobj = row
       })

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue

@@ -43,24 +43,24 @@
         <div class="tableStyle">
           <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
         </div>
-        <el-table :key="tableKey" :data="formobj.voList" :index="index" border style="width: 100%">
+        <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
           <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center" header-align="center">
+          <el-table-column label="车架号" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center">
+          <el-table-column label="车型" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.modelName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库日期" header-align="center" align="center" width="150">
+          <el-table-column label="入库日期" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库价" header-align="center" align="center" width="200">
+          <el-table-column label="入库价" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundPrice }}</span>
             </template>

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue

@@ -40,21 +40,21 @@
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column label="操作" width="180px" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='未售买断申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="120">
+            <el-table-column label="状态" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" width="120">
+            <el-table-column label="申请人" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.applicationName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" width="120">
+            <el-table-column label="申请日期" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime }}</span>
               </template>
@@ -64,7 +64,7 @@
                 <span>{{ scope.row.reason }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="台数" align="center" width="100">
+            <el-table-column label="台数" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.num }}</span>
               </template>
@@ -178,12 +178,6 @@ export default {
         case 'doDel':
           this.doDel()
           break
-        case 'doImport':
-          this.doImport()
-          break
-        case 'doExport':
-          this.doExport()
-          break
         case 'doClose':
           this.doClose()
           break

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@@ -170,17 +170,13 @@ export default {
           vehicleAlias: '',
           vehicleType: '',
           vehicleVersion: '',
-          userSid: window.sessionStorage.getItem('userSid'),
+          userSid: '',
           vinNoList: []
         },
         total: 1
       }
     }
   },
-  created() {
-    // 初始化变量
-    this.init()
-  },
   methods: {
     // 搜索条件效果
     clicksearchShow() {
@@ -325,7 +321,8 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.getList()
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.init()
     },
     // 添加修改返回
     AddUpdateReturn() {

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue

@@ -98,7 +98,7 @@
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
-        <el-row style="border-top: 1px solid #e0e3eb">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="4" class="tleftb">当前环节</el-col>
           <el-col :span="20" class="trightb">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -147,6 +147,7 @@ export default {
       },
       nextNode: {}, // 下一环节
       nodeDialogVisible: false,
+      currentLink: true,
       // 环节所需参数
       linkByParameter: {
         businessSid: '',
@@ -240,14 +241,8 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
+      this.currentLink = false
+      this.nodeDialogVisible = true
     },
     reject() {
       if (this.operation === '同意') {

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

@@ -131,7 +131,7 @@
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd">
-        <el-row>
+        <el-row v-show="currentLink">
           <el-col :span="4" class="tleftb">当前环节</el-col>
           <el-col :span="20" class="trightb">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
@@ -182,6 +182,7 @@ export default {
       vehiclePhoto: [],
       rules: {},
       // ------流程所需------------------------------
+      currentLink:true, // 控制当前环节一行的显示隐藏
       dialogList: {
         comment: ''
       },
@@ -304,7 +305,10 @@ export default {
     // 同意
     openAgree(val) {
       this.operation = val
-      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      const formVariables = {
+        businessSid: this.agreeList.businessSid
+      }
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -316,7 +320,10 @@ export default {
     // 驳回
     openReject(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      const formVariables = {
+        businessSid: this.regectList.businessSid
+      }
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -328,14 +335,19 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
+      this.currentLink = false // 控制当前环节一行的显示隐藏
+      this.nodeDialogVisible = true
+      // const formVariables = {
+      //   businessSid: this.stopList.businessSid
+      // }
+      // req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
+      //   if (resp.success) {
+      //     var arr = resp.data
+      //     this.nextNode = arr[0]
+      //     this.nodeDialogVisible = true
+      //   }
+      //   this.submitdisabled = false
+      // })
     },
     /** 选择代办人确认 */
     confirm() {
@@ -352,11 +364,10 @@ export default {
       this.agreeList.comment = this.dialogList.comment
       req.agreeTask(this.agreeList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -367,13 +378,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
@@ -382,11 +386,10 @@ export default {
       this.regectList.comment = this.dialogList.comment
       req.rejectTask(this.regectList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -397,13 +400,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
@@ -412,11 +408,10 @@ export default {
       this.stopList.comment = this.dialogList.comment
       req.breakTask(this.stopList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -427,13 +422,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue

@@ -174,6 +174,7 @@ export default {
     // const data = window.location.href.slice(one, two) // url解码unescape()已从web中移除,尽量不使用
     const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
     const obj = JSON.parse(decodeURIComponent(data))
+    console.log('obj',obj)
     // var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
     // var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
     // const info = window.location.href.slice(a, b)
@@ -239,12 +240,11 @@ export default {
       // this.revokeList.comment = this.dialogList.comment
       req.revokeTask(this.revokeList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
+            type: 'success'
+          });
           // 子页面向父级页面传递值
           window.parent.postMessage({
             cmd: 'returnHeight',
@@ -253,13 +253,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@@ -162,7 +162,7 @@
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
-        <el-row>
+        <el-row v-show="currentLink">
           <el-col :span="4" class="tleftb">当前环节</el-col>
           <el-col :span="20" class="trightb">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -211,6 +211,7 @@ export default {
       },
       nextNode: {}, // 下一环节
       nodeDialogVisible: false,
+      currentLink: true,
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
@@ -330,14 +331,8 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
+      this.currentLink = false
+      this.nodeDialogVisible = true
     },
     reject() {
       if (this.operation === '同意') {

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -16,7 +16,7 @@
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
-      <div class="listconadd">
+      <div >
         <div class="wlInfo"><span>车辆入账单</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
           <el-row class="lineone">
@@ -123,8 +123,10 @@ export default {
       formobj: {
         sid: '', // 一条数据的sid
         applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
         applicationName: window.sessionStorage.getItem('name'), // 申请人
+        orgSidPath: window.sessionStorage.getItem('orgSidPath'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
         applicationCode: '', // 申请编号
         configName: '',
         departureDate: '',
@@ -148,7 +150,6 @@ export default {
     const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
     const obj = JSON.parse(decodeURIComponent(data))
     this.showInfo(obj.businessSid)
-    console.log('iframe页面获取的obj:', obj)
     // 同意列表
     this.formobj.businessSid = obj.businessSid
     this.formobj.instanceId = obj.instanceId
@@ -158,7 +159,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: 1500 + 'px'
+        data: 600 + 'px'
       }
     }, '*')
   },
@@ -168,7 +169,6 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '【编辑】入账单'
-      console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
         const data = resp.data
         this.formobj.applicationCode = data.applicationCode
@@ -180,6 +180,9 @@ export default {
         this.formobj.modelSid = data.modelSid
         this.formobj.purchaseOrderNo = data.purchaseOrderNo
         this.formobj.vehicleOrderSid = data.vehicleOrderSid
+        this.formobj.taskDefKey = data.taskDefKey
+        this.formobj.taskId = data.taskId
+        this.formobj.nodeState = data.nodeState
         if (data.inboundVehicleList.length > 0) {
           data.inboundVehicleList.forEach((e) => {
             this.formobj.vehicleList.push({
@@ -206,17 +209,22 @@ export default {
       })
     },
     saveEdit() {
-      console.log(this.formobj, 636363)
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
             this.submitdisabled = false
-            this.$message({
-              showClose: true,
-              type: 'success',
-              message: resp.msg
-            })
+            // 子页面向父级页面传递值
+            window.parent.postMessage(
+              {
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              },
+              '*'
+            )
             this.handleReturn('true')
           }).catch(() => {
             this.submitdisabled = false
@@ -229,11 +237,17 @@ export default {
     submitVehicleApply() {
       req.submitVehicleApply(this.formobj).then((res) => {
         if (res.code == '200') {
-          this.$message({
-            showClose: true,
-            type: 'success',
-            message: '提交成功'
-          })
+          // 子页面向父级页面传递值
+          window.parent.postMessage(
+            {
+              cmd: 'returnHeight',
+              params: {
+                // 操作成功，告诉父级页面关闭弹框
+                code: 1
+              }
+            },
+            '*'
+          )
           this.handleReturn('true')
         } else {
           this.$message({

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue

@@ -194,9 +194,7 @@ export default {
     var one = window.location.href.indexOf('&data') + 6
     const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
     var dd = decodeURIComponent(data)
-    console.log('iframe页面获取的dddddddd:', dd)
     const obj = JSON.parse(dd)
-    console.log('iframe页面获取的obj:', obj)
     var sid = obj.businessSid
     this.showInfo(sid)
 
@@ -413,12 +411,16 @@ export default {
       this.stopList.comment = this.dialogList.comment
       req.breakTask(this.stopList).then(response => {
         if (response.code === '200') {
-          this.$notify({
-            title: '提示',
-            message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
+          window.parent.postMessage(
+            {
+              cmd: 'returnHeight',
+              params: {
+                // 操作成功，告诉父级页面关闭弹框
+                code: 1
+              }
+            },
+            '*'
+          )
         } else {
           this.$notify({
             title: '提示',
@@ -434,19 +436,17 @@ export default {
       this.revokeList.comment = this.dialogList.comment
       req.revokeTask(this.revokeList).then(response => {
         if (response.code === '200') {
-          this.$notify({
-            title: '提示',
-            message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
+          window.parent.postMessage(
+            {
+              cmd: 'returnHeight',
+              params: {
+                // 操作成功，告诉父级页面关闭弹框
+                code: 1
+              }
+            },
+            '*'
+          )
         } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     }

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@@ -83,6 +83,26 @@
     <!--End 添加修改部分-->
     <span class="el-icon-picture-outline">流程图</span>
     <flow :xmlData="xmlData" :taskData="taskList"></flow>
+    <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form label-position="right" class="formadd" >
+        <el-row v-show="currentLink">
+          <el-col :span="4" class="tleftb">当前环节</el-col>
+          <el-col :span="20" class="trightb">
+            <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">意见</el-col>
+          <el-col :span="20" class="trightb">
+            <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -113,6 +133,7 @@ export default {
       },
       nextNode: {}, // 下一环节
       nodeDialogVisible: false,
+      currentLink: true,
       // 表单数据
       formobj: {},
       // 环节所需参数
@@ -206,14 +227,8 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
+      this.currentLink = false
+      this.nodeDialogVisible = true
     },
     reject() {
       if (this.operation === '同意') {

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择车辆页面</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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-row>
+                <el-form-item label="品牌:" class="searchlist">
+                  <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="功能:" class="searchlist">
+                  <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="系列:" class="searchlist">
+                  <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="变速箱:" class="searchlist">
+                  <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="驱动:" class="searchlist">
+                  <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="排放标准:" class="searchlist">
+                  <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="马力:" class="searchlist">
+                  <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="燃料:" class="searchlist">
+                  <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="版本:" class="searchlist">
+                  <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="车型:" class="searchlist">
+                  <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
+                </el-form-item>
+                <el-form-item label="快捷检索:" class="searchlist">
+                  <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
+                </el-form-item>
+              </el-row>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" @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" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颜色" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.color }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="存放地点" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.location }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(万元)" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/weishoumaiduan/unsold'
+import { typeValues, brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
+
+export default {
+  name: 'vehicle',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      useOrg: '',
+      carBrand_list: [],
+      vehicleType_list: [],
+      productLine_list: [],
+      gearboxType_list: [],
+      driveForm_list: [],
+      emissionStandard_list: [],
+      power_list: [],
+      fuelType_list: [],
+      vehicleVersion_list: [],
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          brandSid: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          modelName: '',
+          power: '',
+          productLine: '',
+          vehicleAlias: '',
+          vehicleType: '',
+          vehicleVersion: '',
+          userSid: '',
+          vinNoList: []
+        },
+        total: 1
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      this.getPathSid()
+      this.shujuzidian()
+      this.getList()
+    },
+    getPathSid() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
+          this.useOrg = res.data
+        }
+      })
+    },
+    shujuzidian() {
+      // 下拉框-品牌
+      brandDown({ useOrg: this.useOrg }).then((res) => {
+        if (res.success) {
+          this.carBrand_list = res.data
+          console.log('下拉框请求品牌', res.data)
+        }
+      })
+      typeValues({ type: 'vehicleFunction' }).then((res) => {
+        if (res.success) {
+          this.vehicleType_list = res.data
+        }
+      })
+      typeValues({ type: 'productLine' }).then((res) => {
+        if (res.code === '200') {
+          this.productLine_list = res.data
+        }
+      })
+      typeValues({ type: 'driver' }).then((res) => {
+        if (res.code === '200') {
+          this.driveForm_list = res.data
+        }
+      })
+      typeValues({ type: 'horsepower' }).then((res) => {
+        if (res.code === '200') {
+          this.power_list = res.data
+        }
+      })
+      typeValues({ type: 'vehicleVersion' }).then((res) => {
+        if (res.code === '200') {
+          this.vehicleVersion_list = res.data
+        }
+      })
+      typeValues({ type: 'fuelType' }).then((res) => {
+        if (res.code === '200') {
+          this.fuelType_list = res.data
+        }
+      })
+      typeValues({ type: 'gearbox' }).then((res) => {
+        if (res.code === '200') {
+          this.gearboxType_list = res.data
+        }
+      })
+      typeValues({ type: 'emissionStandard' }).then((res) => {
+        if (res.code === '200') {
+          this.emissionStandard_list = res.data
+        }
+      })
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.pageList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+      this.listQuery.params.vinNoList = []
+    },
+    // 查询按钮
+    handleFilter() {
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          brandSid: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          modelName: '',
+          power: '',
+          productLine: '',
+          vehicleAlias: '',
+          vehicleType: '',
+          vehicleVersion: '',
+          userSid: window.sessionStorage.getItem('userSid'),
+          vinNoList: []
+        },
+        total: 0
+      }
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          vinNo: element.vinNo,
+          vehicleAlias: element.vehicleAlias,
+          priceDate: element.priceDate,
+          priced: element.priced
+        })
+      })
+      this.sids = aa
+    },
+    showData(value) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].vinNo)
+        }
+        this.listQuery.params.vinNoList = aa
+      } else {
+        this.listQuery.params.vinNoList = []
+      }
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.init()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条车型记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue → anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue

@@ -7,11 +7,9 @@
         <div>车辆未售买断详情</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button v-show="transactState=='00'" type="primary" @click="openAgree('同意')">同 意</el-button>
-          <el-button v-show="transactState=='00'" type="danger" @click="openReject('驳回')">驳 回</el-button>
-          <el-button v-show="transactState=='00'" type="danger" @click="openStop('终止')">终 止</el-button>
-          <el-button v-show="transactState=='01' && current.taskName !== '排产申请'" type="danger" @click="openRevoke()">撤 回 </el-button>
-          <el-button type="info">关 闭</el-button>
+          <el-button type="primary" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" @click="openStop('终止')">终 止</el-button>
         </div>
       </div>
       <!--标题按钮部分结束-->
@@ -47,24 +45,24 @@
         <div class="tableStyle">
           <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
         </div>
-        <el-table :key="tableKey" :data="formobj.voList" :index="index" border style="width: 100%">
+        <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
           <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="left" header-align="center">
+          <el-table-column label="车架号" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center">
+          <el-table-column label="车型" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.modelName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库日期" header-align="center" width="150">
+          <el-table-column label="入库日期" align="center"">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库价" header-align="center" width="200">
+          <el-table-column label="入库价" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundPrice }}</span>
             </template>
@@ -79,7 +77,7 @@
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
-        <el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="4" class="tleftb">当前环节</el-col>
           <el-col :span="20" class="trightb">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -105,7 +103,7 @@ import req from '@/api/weishoumaiduan/unsold'
 import flow from '../../../baseoutsourcingapplication/workflow/flow'
 
 export default {
-  name: 'maiduanInfo',
+  name: 'weishoumaiduanDaiBanInfo',
   components: {
     flow
   },
@@ -129,10 +127,10 @@ export default {
       },
       nextNode: {}, // 下一环节
       nodeDialogVisible: false,
+      currentLink: true,
       // 表单数据
       formobj: {},
       rules: {},
-      transactState: '', // 办理状态
       // 环节所需参数
       linkByParameter: {
         businessSid: '',
@@ -147,29 +145,21 @@ export default {
   },
   created() {
     console.log('url:' + window.location.href)
-    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
-    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
-    const info = window.location.href.slice(a, b)
-    var sid = info.substr(info.indexOf('=') + 1)
-    this.showInfo(sid)
-    // ===获取参数
-    var one = window.location.href.lastIndexOf('#') + 1
-    var two = window.location.href.lastIndexOf('}') + 1
-    const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
-    var tar = data.substr(data.indexOf('=') + 1)
-    const obj = JSON.parse(tar)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
     console.log('iframe页面获取的obj:', obj)
     // 点击（同意、终止、驳回、驳回）操作时所需的参数
-    this.linkByParameter.businessSid = sid
+    this.linkByParameter.businessSid = obj.businessSid
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    this.linkByParameter.orgSidPath = obj.orgSidPath
-    this.linkByParameter.userSid = obj.userSid
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName
-    // 办理状态
-    this.transactState = obj.transactState
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
     // 加载流程图相关的数据
     this.getModelDetail(obj.deployId)
     this.getFlowViewer(obj.instanceId)
@@ -185,8 +175,8 @@ export default {
     }, '*')
   },
   methods: {
-    showInfo(row) {
-      req.fetchBySid(row.sid).then((res) => {
+    showInfo(sid) {
+      req.fetchBySid(sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
         }
@@ -232,29 +222,8 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
-    },
-    /** 确认撤回任务 */
-    openRevoke() {
-      this.$confirm('是否确认执行撤回操作', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.handleRevoke()
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消撤回'
-        })
-      })
+      this.currentLink = false
+      this.nodeDialogVisible = true
     },
     reject() {
       if (this.operation === '同意') {
@@ -285,13 +254,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
@@ -315,20 +277,12 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
     /** 终止任务 */
     handleStop() {
       this.linkByParameter.comment = this.dialogList.comment
-      console.log(this.stopList, 99999)
       req.breakProcess(this.linkByParameter).then((response) => {
         if (response.success) {
           this.$notify({
@@ -346,43 +300,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      })
-    },
-    /** 撤回任务 */
-    handleRevoke() {
-      this.linkByParameter.comment = this.dialogList.comment
-      req.revokeProcess(this.linkByParameter).then((response) => {
-        if (response.success) {
-          this.$notify({
-            title: '提示',
-            message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
-          this.nodeDialogVisible = false
-          // 子页面向父级页面传递值
-          window.parent.postMessage({
-            cmd: 'returnHeight',
-            params: {
-              // 操作成功，告诉父级页面关闭弹框
-              code: 1
-            }
-          }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     }

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>车辆未售买断详情</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="danger" @click="openRevoke()">撤 回 </el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆未售买断申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row>
+            <el-col :span="4">
+              <span>申请日期:</span>
+            </el-col>
+            <el-col :span="8">
+              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
+            </el-col>
+            <el-col :span="4">
+              <span>申请人:</span>
+            </el-col>
+            <el-col :span="8">
+              <span style="margin-left: 5px">{{ formobj.applicationName }}</span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="el-form-item-right">
+              <span>买断原因:</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item>
+                {{ formobj.reason }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="tableStyle">
+          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+        </div>
+        <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column label="车架号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="车型" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.modelName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="入库日期" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.inboundDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="入库价" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.inboundPrice }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <span class="el-icon-picture-outline">流程图</span>
+    <flow :xmlData="xmlData" :taskData="taskList"></flow>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/weishoumaiduan/unsold'
+import flow from '../../../baseoutsourcingapplication/workflow/flow'
+
+export default {
+  name: 'weishoumaiduanYiBanInfo',
+  components: {
+    flow
+  },
+  data() {
+    return {
+      dialogStatus: '',
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list1: [],
+      xmlData: '', // 模型xml数据
+      taskList: [],
+      // 表单数据
+      formobj: {},
+      rules: {},
+      transactState: '', // 办理状态
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+    // 加载流程图相关的数据
+    this.getModelDetail(obj.deployId)
+    this.getFlowViewer(obj.instanceId)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: document.body.scrollHeight + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    /** xml 文件 */
+    getModelDetail(deployId) {
+      // 发送请求，获取xml
+      req.readXml(deployId).then((res) => {
+        this.xmlData = res.data
+      })
+    },
+    // 已办环节的节点
+    getFlowViewer(procInsId) {
+      req.getFlowViewer(procInsId).then((res) => {
+        this.taskList = res.data
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+/deep/ .el-col-4 {
+  text-align: right;
+  float: left;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
+}
+/deep/ .el-col-8 {
+  text-align: left;
+  float: left;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
+}
+
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue

@@ -15,7 +15,7 @@
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
-      <div class="listconadd">
+      <div class="">
         <div class="wlInfo"><span>车辆未售买断申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
           <el-row>
@@ -57,22 +57,22 @@
               </el-button>
             </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.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center">
+          <el-table-column label="车型" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.modelName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库日期" align="center" width="150">
+          <el-table-column label="入库日期" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库价" align="center" width="200">
+          <el-table-column label="入库价" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundPrice }}</span>
             </template>
@@ -82,18 +82,18 @@
     </div>
     <!--End 添加修改部分-->
     <!--选择车型和常用配置-->
-<!--    <vehicle v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>-->
+    <vehicle v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/weishoumaiduan/unsold'
-// import vehicle from './vehicle.vue'
+import vehicle from './vehicle.vue'
 
 export default {
   name: 'maiduanAdd',
   components: {
-    // vehicle
+    vehicle
   },
   data() {
     return {
@@ -116,21 +116,24 @@ export default {
       submitdisabled: false
     }
   },
-  methods: {
-    // 获取制单日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
-      let day = date.getDate() // 日
-      if (month < 10) {
-        month = '0' + month
-      }
-      if (day < 10) {
-        day = '0' + day
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: document.body.scrollHeight + 'px'
       }
-      this.formobj.createTime = year + '-' + month + '-' + day
-    },
+    }, '*')
+  },
+  methods: {
     // 明细表添加一行数据
     addCommodity() {
       this.viewState = 2
@@ -140,33 +143,17 @@ export default {
     dataDelete(index, row) {
       this.formobj.detailsList.splice(index, 1)
     },
-    showAdd() {
-      this.newDate()
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.formobj.applicationName = window.sessionStorage.getItem('name')
-      this.formobj.userSid = window.sessionStorage.getItem('userSid')
-      this.viewTitle = '【新增】车辆未售买断申请'
-    },
-    showEdit(row) {
+    showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '【编辑】车辆未售买断申请'
-      console.log('编辑回显', row.sid)
-      req.fetchBySid(row.sid).then((resp) => {
-        const data = resp.data
-        this.formobj.applicationName = data.applicationName
-        this.formobj.sid = data.sid
-        this.formobj.reason = data.reason
-        this.formobj.createTime = data.createTime
-        this.formobj.instanceId = data.procInstId
-        this.formobj.userSid = data.userSid
-        this.formobj.taskId = data.taskId
-        this.formobj.detailsList = data.voList
+      console.log('编辑回显', sid)
+      req.fetchBySid(sid).then((resp) => {
+        this.formobj = resp.data
+        this.formobj.instanceId = resp.data.procInstId
       }).catch((e) => {
-        this.formobj = row
+        this.formobj = {}
       })
     },
     // 车型常用配置列表--新增确定返回的数据
@@ -195,7 +182,14 @@ export default {
                 type: 'success',
                 message: resp.msg
               })
-              this.handleReturn('true')
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
             }
           }).catch(() => {
             this.submitdisabled = false
@@ -213,34 +207,17 @@ export default {
             type: 'success',
             message: '提交成功'
           })
-          this.handleReturn('true')
-        } else {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '提交失败'
-          })
+          // 子页面向父级页面传递值(关闭弹框)
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
         }
       })
     },
-    // 返回（===既判断）
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      // 表单数据
-      this.formobj = {
-        sid: '', // 一条数据的sid
-        applicationName: '',
-        createTime: '',
-        reason: '',
-        instanceId: '', // 流程实例ID
-        taskId: '', // 任务ID
-        userSid: '',
-        detailsList: []
-      }
-      this.$refs['form_obj'].resetFields()
-      this.$refs['divVehicle'].getList()
-      this.$emit('doback')
-    },
     closePage() {
       this.viewState = 1
     }

anrui-system-ui/src/views/flow/doneList.vue

@@ -272,8 +272,8 @@
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
-            // this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           } else {
             this.$notify({
               title: '提示',

anrui-system-ui/src/views/flow/todoList.vue

@@ -328,8 +328,8 @@ export default {
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
-            // this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             console.log('已办拼接url:',this.url)
           } else {
             this.$notify({