Merge remote-tracking branch 'origin/master'

3 years ago · 4832bd45e3
43 changed files with 936 additions and 44 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionQuery.java
@ -64,6 +64,9 @@ public class BaseManufactorSubscriptionQuery implements Query {
 	@ApiModelProperty("认款结束日期")
 	private String subscriptionEndDate; // 认款结束日期

+	@ApiModelProperty("厂家采购类型key")
+	private String applyTypeKey; // 厂家采购类型key
+
 	@ApiModelProperty("创建组织sid")
    private String createOrgSid; // 创建组织sid
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java
@ -61,6 +61,11 @@ public interface BaseVehinstallFeign {
    @ResponseBody
    public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq);

+    @ApiOperation("上装调价选择上装台账")
+    @PostMapping("/vehInsMod")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(@RequestBody PagerQuery<BaseVehinstallQuery> pq);
+
    @ApiOperation("新增或修改")
    @PostMapping("/save")
    @ResponseBody
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java
@ -54,6 +54,11 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 		return rb.setMsg("接口anrui-base/basevehinstall/listPage无法访问");
 	}

+	@Override
+	public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(BaseVehinstallDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-base/basevehinstall/save无法访问");
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallQuery.java
@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * Project: anrui-base(上装配置管理) <br/>
 * File: BaseVehinstallQuery.java <br/>
@ -67,4 +69,6 @@ public class BaseVehinstallQuery implements Query {
    private String noticeModel; // 公告型号
    @ApiModelProperty("创建组织")
    private String createOrgSid; // 创建组织
+    @ApiModelProperty("上装台账sid")
+    private List<String> jacketSidList; // 上装台账sid
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallVo.java
@ -83,4 +83,6 @@ public class BaseVehinstallVo implements Vo {
    private String priceDate; // 入库日期
    @ApiModelProperty("出库日期")
    private String salesDate; // 出库日期
+    @ApiModelProperty("主车销售指导价")
+    private String vehGuidePrice; // 主车销售指导价
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java
@ -76,9 +76,4 @@ public interface BaseVehinstallmodelFeign {
    @GetMapping("/fetchDetailsBySid/{sid}")
    @ResponseBody
    public ResultBean<BaseVehinstallmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
-    /**********************************流程接口*******************************************/
-
-
-
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceFeign.java
@ -25,14 +25,23 @@
 *********************************************************/
 package com.yxt.anrui.base.api.basevehinstallmodprice;

+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceCompleteDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceTaskQuery;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.SubmitBaseVehInstallModPriceDto;
 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.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;

+import javax.validation.Valid;
 import java.util.List;

 /**
@ -75,4 +84,34 @@ public interface BaseVehinstallModpriceFeign {
    @GetMapping("/fetchDetailsBySid/{sid}")
    @ResponseBody
    public ResultBean<BaseVehinstallModpriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /*************************************上装调价流程**************************************/
+
+    @ApiOperation("提交上装调价流程")
+    @PostMapping("/submitBaseVehInstallModPrice")
+    public ResultBean submitBaseVehInstallModPrice(@Valid @RequestBody SubmitBaseVehInstallModPriceDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody BaseVehInstallModPriceCompleteDto query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BaseVehInstallModPriceTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BaseVehInstallModPriceTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BaseVehInstallModPriceTaskQuery query);
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceFeignFallback.java
@ -25,6 +25,10 @@
 *********************************************************/
 package com.yxt.anrui.base.api.basevehinstallmodprice;

+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceCompleteDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceTaskQuery;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.SubmitBaseVehInstallModPriceDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@ -69,4 +73,39 @@ public class BaseVehinstallModpriceFeignFallback implements BaseVehinstallModpri
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehinstallmodprice/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean submitBaseVehInstallModPrice(SubmitBaseVehInstallModPriceDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(BaseVehInstallModPriceCompleteDto query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(BaseVehInstallModPriceTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(BaseVehInstallModPriceTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(BaseVehInstallModPriceTaskQuery query) {
+		return null;
+	}
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/BaseVehInstallModPriceCompleteDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/BaseVehInstallModPriceCompleteDto.java
@ -0,0 +1,41 @@
+package com.yxt.anrui.base.api.basevehinstallmodprice.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class BaseVehInstallModPriceCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
+    private Map<String, Object> formVariables;
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/BaseVehInstallModPriceTaskQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/BaseVehInstallModPriceTaskQuery.java
@ -0,0 +1,44 @@
+package com.yxt.anrui.base.api.basevehinstallmodprice.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class BaseVehInstallModPriceTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/GetNodeQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/GetNodeQuery.java
@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.basevehinstallmodprice.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+/*
+    @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？")
+    private Map<String, Object> formVariables;*/
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/GetNodeVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/GetNodeVo.java
@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basevehinstallmodprice.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/SubmitBaseVehInstallModPriceDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/flow/SubmitBaseVehInstallModPriceDto.java
@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basevehinstallmodprice.flow;
+
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.BaseVehinstallModpriceDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitBaseVehInstallModPriceDto extends BaseVehinstallModpriceDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodpricedetail/BaseVehinstallModpricedetailDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodpricedetail/BaseVehinstallModpricedetailDto.java
@ -75,5 +75,6 @@ public class BaseVehinstallModpricedetailDto implements Dto {
    private BigDecimal incOrDecInPrice; // 价格增减数额
 	@ApiModelProperty("调整后整车销售指导价")
    private BigDecimal adjustVehGuidedPrice; // 调整后整车销售指导价
-
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }
--- a/anrui-base/anrui-base-biz/pom.xml
+++ b/anrui-base/anrui-base-biz/pom.xml
@ -8,6 +8,7 @@
        <version>0.0.1</version>
        <relativePath/>
    </parent>
+
    <modelVersion>4.0.0</modelVersion>

    <artifactId>anrui-base-biz</artifactId>
@ -15,6 +16,11 @@
    <version>0.0.1</version>

    <dependencies>
+        <dependency>
+            <groupId>com.yxt.messagecenter</groupId>
+            <artifactId>message-center-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
        <dependency>
            <groupId>com.yxt</groupId>
            <artifactId>yxt-common-base</artifactId>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
        "com.yxt.common.base.config",
        "com.yxt.anrui.base"
 })
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter"})
 public class BaseApplication {

    public static void main(String[] args) {
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@ -26,6 +26,7 @@
 package com.yxt.anrui.base.biz.baseinternalpurchase;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@ -40,6 +41,7 @@ import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
@ -460,6 +462,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                    scmEntryVehicleExamineDto.setVinNo(booad.getVinNo());
                    scmEntryVehicleExamineDto.setInspectionResult("1");
                    scmEntryVehicleExamineDto.setPrice("");
+                    //根据车架号查询厂家入库日期
+                    String vinNo = booad.getVinNo();
+                    BaseVehicleVo data = baseVehicleService.selVehicleByVinNo(vinNo).getData();
+                    scmEntryVehicleExamineDto.setInboundDate(DateUtil.formatDate(data.getPriceDate()));
                    ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
                    if (!resultBean1.getSuccess()) {
                        return rb.setMsg("验车业务模块的数据推送失败!");
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@ -428,4 +428,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
    int getStockNum(@Param(Constants.WRAPPER) QueryWrapper<Object> qwq);

    List<Map<String,String>> purSellVinNoAndLoc(@Param(Constants.WRAPPER) QueryWrapper<Object> qw);
+
+    BaseVehicle selVehicleByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@ -1009,4 +1009,11 @@
            ${ew.sqlSegment}
        </where>
    </select>
+
+    <select id="selVehicleByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        SELECT *
+        FROM base_vehicle
+        WHERE vinNo = #{vinNo}
+          AND createOrgSid = #{createOrgSid}
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -1634,9 +1634,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        ResultBean rb = ResultBean.fireFail();
        List<String> stringList = baseVehinstallService.selectListVo(createOrgSid);
        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        qw.notIn("bv.vinNo", stringList);
        qw.eq("bv.createOrgSid", createOrgSid);
        qw.eq("bvm.createOrg", createOrgSid);
+        if (stringList.size() > 0) {
+            qw.notIn("bv.vinNo", stringList);
+        }
        List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
        return rb.success().setData(baseExistingCarListVo);
    }
@ -2144,4 +2146,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        List<Map<String, String>> maps = baseMapper.purSellVinNoAndLoc(qw);
        return rb.success().setData(maps);
    }
+
+    public BaseVehicle selVehicleByVinNoAndOrgSid(String vinNo, String createOrgSid) {
+        return baseMapper.selVehicleByVinNoAndOrgSid(vinNo,createOrgSid);
+    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
@ -72,6 +72,13 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 		return rb.success().setData(pv);
 	}

+	@Override
+	public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehinstallVo> pv = baseVehinstallService.vehInsMod(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
@ -28,9 +28,13 @@ package com.yxt.anrui.base.biz.basevehinstall;
 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.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@ -67,6 +71,10 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp

 	@Autowired
 	private BaseVehinstallmodelService baseVehinstallmodelService;
+	@Autowired
+	private BaseVehicleService baseVehicleService;
+	@Autowired
+	private BaseVehmodelConfigService baseVehmodelConfigService;

 	private QueryWrapper<BaseVehinstall> createQueryWrapper(BaseVehinstallQuery query) {
 		// todo: 这里根据具体业务调整查询条件
@ -122,6 +130,10 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 	public void insertByDto(BaseVehinstallDto dto){
 		BaseVehinstall entity = new BaseVehinstall();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		String salesDate = entity.getSalesDate();
+		if (StringUtils.isBlank(salesDate)){
+			entity.setSalesDate("");
+		}
 		baseMapper.insert(entity);
 	}
 	
@ -149,4 +161,52 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 	public List<String> selectListVo(String createOrgSid) {
 		return baseMapper.selectListVo(createOrgSid);
 	}
+
+	public PagerVo<BaseVehinstallVo> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
+		BaseVehinstallQuery query = pq.getParams();
+		QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
+		qw.eq("bv.createOrg",query.getCreateOrgSid());
+		qw.eq("bvm.createOrgSid",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getVehicleTypeKey())){
+			qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitMethodKey())){
+			qw.eq("bvm.refitMethodKey",query.getRefitMethodKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitFactory())){
+			qw.like("bvm.refitFactory",query.getRefitFactory());
+		}
+		if (StringUtils.isNotBlank(query.getInstallNameKey())){
+			qw.eq("bvm.installNameKey",query.getInstallNameKey());
+		}
+		if (StringUtils.isNotBlank(query.getColorKey())){
+			qw.eq("bvm.colorKey",query.getColorKey());
+		}
+		if (StringUtils.isNotBlank(query.getPlateMaterialKey())){
+			qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey());
+		}
+		if (StringUtils.isNotBlank(query.getNoticeModel())){
+			qw.like("bv.noticeModel",query.getNoticeModel());
+		}
+		if (StringUtils.isNotBlank(query.getVinNo())){
+			qw.like("bv.vinNo",query.getVinNo());
+		}
+		if (query.getJacketSidList().size() > 0) {
+			qw.notIn("bv.sid", query.getJacketSidList());
+		}
+		IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
+		IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
+		List<BaseVehinstallVo> records = pagging.getRecords();
+		for (BaseVehinstallVo record : records) {
+			String vinNo = record.getVinNo();
+			BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, query.getCreateOrgSid());
+			String modelSid = baseVehicle.getModelSid();
+			String modelConfigSid = baseVehicle.getModelConfigSid();
+			BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(modelSid, modelConfigSid, query.getCreateOrgSid());
+			String guidedPrice = baseVehmodelVo.getGuidedPrice();
+			record.setVehGuidePrice(guidedPrice);
+		}
+		PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.java
@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basevehinstallmodprice.BaseVehinstallModprice;
 import com.yxt.anrui.base.api.basevehinstallmodprice.BaseVehinstallModpriceVo;

 import java.util.List;
+import java.util.Map;

 /**
 * Project: anrui-base(上装调价) <br/>
@ -62,4 +63,6 @@ public interface BaseVehinstallModpriceMapper extends BaseMapper<BaseVehinstallM
 	
 	@Select("select * from base_vehinstall_modprice")
 	List<BaseVehinstallModpriceVo> selectListVo();
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.xml
@ -10,4 +10,19 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstallmodprice.BaseVehinstallModpriceVo">
 		SELECT * FROM base_vehinstall_modprice <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE base_vehinstall_modprice
+		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceRest.java
@ -25,6 +25,16 @@
 *********************************************************/
 package com.yxt.anrui.base.biz.basevehinstallmodprice;

+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceCompleteDto;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceTaskQuery;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.SubmitBaseVehInstallModPriceDto;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@ -92,4 +102,45 @@ public class BaseVehinstallModpriceRest implements BaseVehinstallModpriceFeign {
    public ResultBean<BaseVehinstallModpriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return baseVehinstallModpriceService.fetchDetailsVoBySid(sid);
 	}
+
+	/************************************上装调价申请流程******************************/
+
+	@Override
+	public ResultBean submitBaseVehInstallModPrice(SubmitBaseVehInstallModPriceDto dto) {
+		return baseVehinstallModpriceService.submitBaseVehInstallModPrice(dto);
+	}
+
+	@Override
+	public ResultBean complete(BaseVehInstallModPriceCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
+		bv.setFormVariables(BeanUtil.beanToMap(query));
+		return baseVehinstallModpriceService.complete(bv);
+	}
+
+	@Override
+	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+		return baseVehinstallModpriceService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+		return baseVehinstallModpriceService.getPreviousNodesForReject(query);
+	}
+
+	@Override
+	public ResultBean taskReject(BaseVehInstallModPriceTaskQuery query) {
+		return baseVehinstallModpriceService.taskReject(query);
+	}
+
+	@Override
+	public ResultBean revokeProcess(BaseVehInstallModPriceTaskQuery query) {
+		return baseVehinstallModpriceService.revokeProcess(query);
+	}
+
+	@Override
+	public ResultBean breakProcess(BaseVehInstallModPriceTaskQuery query) {
+		return baseVehinstallModpriceService.breakProcess(query);
+	}
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
@ -26,11 +26,31 @@
 package com.yxt.anrui.base.biz.basevehinstallmodprice;

 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.BaseVehInstallModPriceTaskQuery;
+import com.yxt.anrui.base.api.basevehinstallmodprice.flow.SubmitBaseVehInstallModPriceDto;
 import com.yxt.anrui.base.api.basevehinstallmodpricedetail.BaseVehinstallModpricedetailDetailsVo;
 import com.yxt.anrui.base.api.basevehinstallmodpricedetail.BaseVehinstallModpricedetailDto;
+import com.yxt.anrui.base.api.basevehinstallmodpricedetail.BaseVehinstallModpricedetailVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
+import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.basevehinstallmodpricedetail.BaseVehinstallModpricedetailService;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@ -47,7 +67,12 @@ import com.yxt.anrui.base.api.basevehinstallmodprice.BaseVehinstallModpriceFeign
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;

 /**
 * Project: anrui-base(上装调价) <br/>
@ -67,6 +92,14 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins

    @Autowired
    private BaseVehinstallModpricedetailService baseVehinstallModpricedetailService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;

    private QueryWrapper<BaseVehinstallModprice> createQueryWrapper(BaseVehinstallModpriceQuery query) {
        // todo: 这里根据具体业务调整查询条件
@ -90,7 +123,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
        return p;
    }

-    public ResultBean saveOrUpdateDto(BaseVehinstallModpriceDto dto) {
+    public ResultBean<String> saveOrUpdateDto(BaseVehinstallModpriceDto dto) {
        ResultBean rb = ResultBean.fireFail();
        String dtoSid = dto.getSid();
        List<BaseVehinstallModpricedetailDto> baseVehinstallModpricedetails = dto.getBaseVehinstallModpricedetails();
@ -101,7 +134,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
                baseVehinstallModpricedetail.setMainSid(sid);
                baseVehinstallModpricedetailService.saveOrUpdateDto(baseVehinstallModpricedetail);
            }
-            return rb.success().setMsg("添加成功");
+            return rb.success().setMsg("添加成功").setData(sid);
        }
        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(dtoSid);
        if (baseVehinstallModprice == null){
@ -113,13 +146,14 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
            baseVehinstallModpricedetail.setMainSid(dtoSid);
            baseVehinstallModpricedetailService.saveOrUpdateDto(baseVehinstallModpricedetail);
        }
-        return rb.success().setMsg("修改成功");
+        return rb.success().setMsg("修改成功").setData(dtoSid);
    }

    public ResultBean<String> insertByDto(BaseVehinstallModpriceDto dto) {
        ResultBean rb = ResultBean.fireFail();
        BaseVehinstallModprice entity = new BaseVehinstallModprice();
        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
        baseMapper.insert(entity);
        return rb.success().setMsg("添加成功").setData(entity.getSid());
    }
@ -152,4 +186,227 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
        }
        return rb.success().setMsg("删除成功");
    }
+
+    public ResultBean submitBaseVehInstallModPrice(SubmitBaseVehInstallModPriceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, baseVehinstallModprice);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(baseVehinstallModprice.getTaskId());
+            bv.setTaskDefKey(baseVehinstallModprice.getNodeSid());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitBaseVehInstallModPriceDto dto, BaseVehinstallModprice baseVehinstallModprice) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (baseVehinstallModprice != null) {
+                String businessTaskId = baseVehinstallModprice.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(bv.getBusinessSid());
+        List<BaseVehinstallModpricedetailDetailsVo> baseVehinstallModpricedetailDetailsVos = baseVehinstallModpricedetailService.fetchByMainSid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(baseVehinstallModprice.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            //String taskDefKey = resultBean.getData().getTaskDefKey();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            /*if ("Event_end".equals(taskDefKey)) {
+                for (BaseVehinstallModpricedetailDetailsVo baseVehinstallModpricedetailDetailsVo : baseVehinstallModpricedetailDetailsVos) {
+                    BigDecimal incOrDecInPrice = baseVehinstallModpricedetailDetailsVo.getIncOrDecInPrice();
+                    BigDecimal guidedPrice = baseVehinstallModpricedetailDetailsVo.getGuidedPrice();
+                    guidedPrice = guidedPrice.add(incOrDecInPrice);
+                    String modelSid = baseVehinstallModpricedetailDetailsVo.getModelSid();
+                    String configSid = baseVehinstallModpricedetailDetailsVo.getConfigSid();
+                    String createOrgSid = baseVehinstallModpricedetailDetailsVo.getCreateOrgSid();
+                    BaseVehmodelConfig baseVehmodelConfig = baseVehmodelConfigMapper.selectSid(modelSid, configSid, createOrgSid);
+                    if (baseVehmodelConfig == null) {
+                        return rb.setMsg("车型配置不存在");
+                    }
+                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice, baseVehmodelConfig.getSid());
+                }
+            }*/
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean taskReject(BaseVehInstallModPriceTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(query.getBusinessSid());
+        if (baseVehinstallModprice == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = baseVehinstallModprice.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean revokeProcess(BaseVehInstallModPriceTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询调价申请
+        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(query.getBusinessSid());
+        String businessTaskId = baseVehinstallModprice.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(BaseVehInstallModPriceTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        BaseVehinstallModprice baseVehinstallModprice = fetchBySid(query.getBusinessSid());
+        String businessTaskId = baseVehinstallModprice.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@ -41,17 +41,28 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.JPushServer;
 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.messagecenter.api.message.AppMessageDto;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.messagelist.MessageListDto;
+import com.yxt.messagecenter.api.messagelist.MessageListFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;

 /**
@ -94,6 +105,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
    @Autowired
    private BusVehicleApplySzService busVehicleApplySzService;

+    @Autowired
+    private MessageTypeFeign messageTypeFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private MessageListFeign messageListFeign;
+
    /**
     * 分页列表
     *
@ -116,11 +134,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
            if (StringUtils.isNotBlank(query.getUserSid())) {
                qw.eq("bva.createBySid", query.getUserSid());
            }
-            if(StringUtils.isNotBlank(query.getApplyTypeKey())){
-                qw.eq("bva.applyTypeKey",query.getApplyTypeKey());
+            if (StringUtils.isNotBlank(query.getApplyTypeKey())) {
+                qw.eq("bva.applyTypeKey", query.getApplyTypeKey());
            }
-            if(StringUtils.isNotBlank(query.getSchedulingTypeKey())){
-                qw.eq("bva.schedulingTypeKey",query.getSchedulingTypeKey());
+            if (StringUtils.isNotBlank(query.getSchedulingTypeKey())) {
+                qw.eq("bva.schedulingTypeKey", query.getSchedulingTypeKey());
            }

            //查询分公司sid
@ -337,10 +355,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
        BusinessVariables bv = new BusinessVariables();
        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
        Map<String, Object> variables = new HashMap<>();
-        Map<String,Object> appMap = new HashMap<>();
-        appMap.put("sid",businessSid);
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
        variables.put("money", Integer.valueOf(dto.getCurrentAmount()).intValue() > 0);
-        variables.put("app",appMap);
+        variables.put("app", appMap);
        //用户的部门全路径sid
        bv.setOrgSidPath(orgSidPath);
        //业务sid
@ -357,6 +375,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
            }
            UpdateFlowFieldVo ufVo = voResultBean.getData();
            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送信息
+//            messageJpush(ufVo.getTaskDefKey(), businessSid, orgSidPath);
            return voResultBean;
        }
        if (r == 2) {
@ -373,6 +393,75 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
        return rb;
    }

+    public void messageJpush(String taskDefKey, String businessSid, String orgSidPath) {
+        BusVehicleApply busVehicleApply = fetchBySid(businessSid);
+        GetNodeQuery getNodeQuery = new GetNodeQuery();
+        getNodeQuery.setTaskDefKey(taskDefKey);
+        getNodeQuery.setBusinessSid(businessSid);
+        ResultBean<List<GetNodeVo>> nodeVoList = getNextNodesForSubmit(getNodeQuery);
+        //根据组织架构、角色两个参数取相关符合条件的用户信息
+        UserQuery userQuery = new UserQuery();
+        userQuery.setRoleSid(nodeVoList.getData().get(0).getCandidateGroups().get(0));
+        userQuery.setOrgSidPath(orgSidPath);
+        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        List<String> stringList = new ArrayList<>();
+        for (SysUserVo su : sysUserVos) {
+            stringList.add(su.getSid());
+//            nextNodeUserSids.append(su.getSid()).append(",");
+        }
+        //符合条件的用户的sid,拼接的字符串
+//        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        //标题、内容、消息类别key、消息类别名称、
+        JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "系统消息", stringList.toArray(new String[stringList.size()]));
+    }
+
+    public String getMessage(List<String> list) {
+        // 1、保存消息体
+        AppMessageDto messageDto = new AppMessageDto();
+        ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList("0002");
+        if (messageBean.getSuccess() && messageBean.getData() != null) {
+            List<MessageTypeVo> typeVoList = messageBean.getData();
+            for (MessageTypeVo message : typeVoList) {
+                if (message.getMsgType().equals("系统消息")) {
+                    messageDto.setMsgTypeSid(message.getMsgTypeSid());
+                    messageDto.setMsgType(message.getMsgType());
+                }
+            }
+        }
+        messageDto.setMsgTitle("排产申请审批");
+        messageDto.setMsgContent("排产申请审批");
+        messageDto.setMsgSource("排产");
+        String msgSid = messageFeign.saveOrUpdateAppMessage(messageDto).getData();
+        String msgTypeSid = messageDto.getMsgTypeSid();
+        // 2、保存至消息列表
+        // 使用多线程保存
+        List<Future<?>> futures = new ArrayList<Future<?>>();
+        ExecutorService executor = Executors.newFixedThreadPool(4);
+        for (String receverSid : list) {
+            Future<?> f = executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                        MessageListDto messageList = new MessageListDto();
+                        messageList.setMsgSid(msgSid);
+                        messageList.setRDelStatus(0);
+                        messageList.setSDelStatus(0);
+                        messageList.setReceiverSid(receverSid);
+                        messageListFeign.save(messageList);
+                        System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            futures.add(f);
+        }
+        executor.shutdown();
+        return msgSid;
+    }
+
    /**
     * 判断提交的流程是否被允许
     *
@ -466,8 +555,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                    finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
                    finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
                    finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
-                    finPaymentrecordDto.setCostTitleKey("1");
-                    finPaymentrecordDto.setCostTitleValue("车款");
+                    finPaymentrecordDto.setCostTitleKey("2");
+                    finPaymentrecordDto.setCostTitleValue("订金");
                    finPaymentrecordDto.setCostTypeKey("2");
                    finPaymentrecordDto.setCostTypeValue("排产");
                    //查询收款单位和收款账号
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
@ -1,6 +1,6 @@
 import request from '@/utils/request'

-// 销售订单代办任务同意办理
+// 销售订单代办任务同意办理 (8.9修改后)
 export function businessAgree(params) {
  return request({
    url: "/buscenter/v1/bussalesorder/complete",
@ -47,3 +47,20 @@ export function revokeTask(params) {
    }
  })
 }
+
+// 销售订单审批流程（同意）获取下一环节 (8.9修改后)
+export function getNextNodesForSubmit(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit',
+    method: 'get',
+    params: params
+  })
+}
+// 审批流程（驳回、终止）获取上一环节(8.9修改后)
+export function getPreviousNodesForReject(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject',
+    method: 'get',
+    params: params
+  })
+}
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
@ -36,7 +36,7 @@ export function saveOrderForm(data) {
  });
 }

-// 编辑、详情初始化 已改
+// 编辑、详情初始化 已改(8.9修改后)
 export function fetchDetailsBySid(params) {
  return request({
    url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid,
@ -44,7 +44,7 @@ export function fetchDetailsBySid(params) {
    params: params,
  });
 }
-// 销售订单提交接口
+// 销售订单提交接口 (8.9修改后)
 export function submitOrderForm(params) {
  return request({
    url: "/buscenter/v1/bussalesorder/submit",
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@ -28,7 +28,8 @@ public enum ProcDefEnum {
    FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
    BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:400012"),
-    BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008")
+    BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
+    BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
    ;

    ProcDefEnum(String proDefName, String proDefId) {
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@ -271,9 +271,9 @@ public class FlowableRest implements FlowableFeign {
            return rb.setMsg("任务不存在");
        }
        String assignee = task.getAssignee();
-        if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){
+       /* if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){
            return rb.setMsg("当前用户不是环节的待办人，不能进行办理操作!");
-        }
+        }*/
        String nodeState = "";
        String taskDefKey = "";
        vo.setSid(businessSid);
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@ -101,6 +101,7 @@ public class SysOrganizationRest implements SysOrganizationFeign {
        entity.setSid(sid);
        String zgStaffSid = dto.getZgStaffSid();
        String fgStaffSid = dto.getFgStaffSid();
+        sysStaffOrgService.delZGAndFGByOrgSid(sid);
 //        sysStaffOrgService.delByOrgSid(sid);//？为啥要删掉？？？暂时注释
        if (org.apache.commons.lang3.StringUtils.isNotBlank(zgStaffSid)) {
            sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", entity);
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
@ -81,4 +81,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {

    @Select("select * from sys_staff_org where staffSid=#{sid}")
    SysStaffOrg getOrgByStaffSid(String sid);
+
+    @Delete("delete from sys_staff_org where orgSid=#{sid} and (manageType = 1 or manageType = 2)")
+    void delZGAndFGByOrgSid(String sid);
 }
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
@ -238,4 +238,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
        return getOrgByOrgSid(sysOrganization.getPsid());

    }
+
+    public void delZGAndFGByOrgSid(String sid) {
+        baseMapper.delZGAndFGByOrgSid(sid);
+    }
 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@ -593,7 +593,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
        List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid());
        if (scmVehicleGressionVos.size() > 0) {
            if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
-                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
                    return rb.setMsg("该申请已存在，请务重复提交！");
                }
            }
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
@ -222,6 +222,13 @@ export default {
    return {
      btndisabled: false,
      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toQuickAdd',
+          btnLabel: '快速新增'
+        },
        {
          type: 'primary',
          size: 'small',
@ -345,6 +352,9 @@ export default {
    btnHandle(btnKey) {
      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
      switch (btnKey) {
+        case 'toQuickAdd':
+          this.toQuickAdd()
+          break
        case 'toAdd':
          this.toAdd()
          break
@ -558,6 +568,29 @@ export default {
      this.sids = aa
      console.log('sids', this.sids)
    },
+    // 打开快速添加
+    toQuickAdd() {
+      if (this.sids.length === 1) {
+        this.viewState = 2
+        const sid = this.sids[0]
+        this.$refs['divadd'].showQuickAdd(sid)
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个车型进行快速新增操作!',
+          type: 'info',
+          duration: 2000
+        })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择车型进行快速新增操作!',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    },
    // 打开添加
    toAdd() {
      this.viewState = 2
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
@ -191,8 +191,7 @@ import {
  SaveList,
  selectByOrgSid
 } from '@/api/cheliang/basevehiclemodel'
-import {fetchBySid} from '@/api/cheliang/dictcommons'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
 import Upload from '@/components/uploadFile/uploadImg.vue'

 export default {
@ -353,7 +352,41 @@ export default {
        this.setDetaList()
        this.getChang()
      },
-
+      showQuickAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.dialogStatus = 'add'
+        this.stateId = 0
+        this.viewTitle = '【新增】常用配置信息'
+        // 此时数据必须修改才能保存
+        const userSid = window.sessionStorage.getItem('userSid')
+        getAll({ sid: sid, userSid: userSid }).then(resp => {
+          if (resp.success) {
+            const data = resp.data
+            this.temp = data
+            this.temp = JSON.parse(JSON.stringify(this.temp).replace(
+                /baseVehicleModelAppendixVos/g,
+                'baseVehicleModelAppendixDtos'
+              )
+            )
+            this.temp.sid = ''
+            if (this.temp.baseVehicleModelAppendixDtos.length > 0) {
+              for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) {
+                var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/')
+                this.imgList.push({
+                  name: imgName[imgName.length - 1],
+                  url: this.temp.baseVehicleModelAppendixDtos[i].filePath
+                })
+              }
+              console.log('123123', this.imgList)
+            }
+          }
+        })
+        this.getPathSid()
+        this.setDetaList()
+        this.getChang()
+      },
      showEdit(sid, row) {
        console.log(sid)
        console.log('imgList', this.imgList)
@ -426,13 +459,15 @@ export default {
      },
      getUrl() {
        console.log('已有图片', this.imgList)
+        var img_file = []
        for (var i = 0; i < this.imgList.length; i++) {
          console.log(this.temp)
-          this.temp.baseVehicleModelAppendixDtos.push({
+          img_file.push({
            modelSid: this.temp.sid,
            filePath: this.imgList[i].url
          })
        }
+        this.temp.baseVehicleModelAppendixDtos = img_file
      },
      updateUrl() {
        console.log('回显', this.imgList)
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
@ -165,7 +165,12 @@
                  <span>{{ props.row.specification }}</span>
                </template>
              </el-table-column>
-              <el-table-column prop="netReceiptsNum" width="150" label="后桥速比" align="center">
+              <el-table-column prop="netReceiptsNum" width="150" label="后桥" align="center">
+                <template slot-scope="props">
+                  <span>{{ props.row.rearAxleValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="netReceiptsNum" width="150" label="速比" align="center">
                <template slot-scope="props">
                  <span>{{ props.row.rearAxleRatio }}</span>
                </template>
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
@ -166,7 +166,12 @@
                <span>{{ scope.row.specification }}</span>
              </template>
            </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.rearAxleRatio }}</span>
              </template>
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
@ -170,7 +170,12 @@
                <span>{{ scope.row.specification }}</span>
              </template>
            </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.rearAxleRatio }}</span>
              </template>
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@ -183,7 +183,12 @@
              <span>{{ scope.row.specification }}</span>
            </template>
          </el-table-column>
-          <el-table-column label="后桥速比" width="130px" align="center">
+          <el-table-column label="后桥" width="130px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.rearAxleValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="速比" width="130px" align="center">
            <template slot-scope="scope">
              <span>{{ scope.row.rearAxleRatio }}</span>
            </template>
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@ -29,6 +29,13 @@
                </el-select>
                <!--    <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
              </el-form-item>
+              <el-form-item label="验车日期">
+                <el-date-picker v-model="listQuery.params.inspectedStartDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                <label>至</label>
+                <el-date-picker v-model="listQuery.params.inspectedEndDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+              </el-form-item>
            </el-form>
            <div class="btn" style="text-align: center;">
              <el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
@ -126,6 +133,8 @@ export default {
          vin: '',
          model: '',
          purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
          userSid: window.sessionStorage.getItem('userSid')
        }
      },
@ -187,6 +196,8 @@ export default {
          vin: '',
          model: '',
          purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
          userSid: window.sessionStorage.getItem('userSid')
        }
      }
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@ -44,7 +44,7 @@
        <tr>
          <td>主管人员</td>
          <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px">
+            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>
              <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
              </el-option>
            </el-select>
@ -52,7 +52,7 @@

          <td>分管人员</td>
          <td>
-            <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
              <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
            </el-select>
            <!--            <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
@ -217,7 +217,7 @@
          <tr>
            <td>主管人员</td>
            <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" @change="zgStaffSidChange">
+              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">
                <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
                </el-option>
              </el-select>
@ -225,7 +225,7 @@

            <td>分管人员</td>
            <td>
-              <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
                <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
              </el-select>
            </td>
@ -312,7 +312,7 @@ export default {
        sort: '',
        isDept: ''
      },
-
+      fgStaffSid: [],
      formBackup: Object.assign({}, this.form),
      isshow: 'table',
      page: {
@ -376,7 +376,12 @@ export default {
      })
    },
    save() {
-      this.form.fgStaffSid = this.form.fgStaffSid.join()
+      if (this.fgStaffSid.length > 0) {
+        this.form.fgStaffSid = this.fgStaffSid.join()
+      } else {
+        this.form.fgStaffName = ''
+        this.form.fgStaffSid = ''
+      }
      this.form.organizationSid = this.$store.getters.userInfo.orgSid
 //      this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
      if (this.form.sid) {
@ -384,7 +389,7 @@ export default {
        putOrgtree(this.form).then(res => {
          this.isshow = 'table'
          this.getOrgTree()
-          this.handleNodeClick({ sid: this.form.psid })
+          this.handleNodeClick({sid: this.form.psid})
          this.$message({
            message: res.msg,
            type: 'success'
@ -423,10 +428,13 @@ export default {
        if (response.success) {
          this.form = response.data
          this.form.fgStaffName = response.data.fgNames
-          this.form.fgStaffSid = response.data.fgStaffSid.split(',')
+          this.form.fgStaffSid = response.data.fgStaffSid
+          if (this.form.fgStaffSid) {
+            this.fgStaffSid = response.data.fgStaffSid.split(',')
+          }
          this.form.zgStaffName = response.data.zgNames
          this.form.zgStaffSid = response.data.zgStaffSid
-          console.log('112233445566', this.form)
+          console.log('编辑回显的数据', this.form)
        }
      })
 //       console.log('点击编辑', row)
@ -465,6 +473,7 @@ export default {
      this.form.fgStaffSid = data.fgSids.split(',')
    },
    nodeSave() { // 节点编辑保存
+      console.log('这是保存nodeSave(0')
      this.form.fgStaffSid = this.form.fgStaffSid.join()
      postOrgtree(this.form).then(res => {
        this.getOrgTree()