Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/BaseAccAdjApplyCompleteDto.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.base.api.baseaccadjapply.flow;
 
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,4 +40,6 @@ public class BaseAccAdjApplyCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

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

@@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class VinByWarehouseQuery implements Query {
     private static final long serialVersionUID = -4205300860994909841L;
@@ -19,4 +21,7 @@ public class VinByWarehouseQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
+
+    @ApiModelProperty("已选择车架号")
+    private List<String> vins;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+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: comc(comc) <br/>
+ * File: BaseVehicleTempstate.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstate <br/>
+ * Description: 车辆临时状态表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆临时状态表", description = "车辆临时状态表")
+@TableName("base_vehicle_tempstate")
+public class BaseVehicleTempstate extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+	@ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateVo.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateVo <br/>
+ * Description: 车辆临时状态表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆临时状态表 视图数据详情", description = "车辆临时状态表 视图数据详情")
+public class BaseVehicleTempstateDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+	@ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateDto.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateDto <br/>
+ * Description: 车辆临时状态表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆临时状态表 数据传输对象", description = "车辆临时状态表 数据传输对象")
+public class BaseVehicleTempstateDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+	@ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+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: comc(comc) <br/>
+ * File: BaseVehicleTempstateFeign.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateFeign <br/>
+ * Description: 车辆临时状态表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车辆临时状态表")
+@FeignClient(
+        contextId = "comc-BaseVehicleTempstate",
+        name = "comc",
+        path = "v1/basevehicletempstate",
+        fallback = BaseVehicleTempstateFeignFallback.class)
+public interface BaseVehicleTempstateFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehicleTempstateDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据业务sid删除记录")
+    @DeleteMapping("/delByBusSid")
+    @ResponseBody
+    public ResultBean delByBusSid(String businessSid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+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: comc(comc) <br/>
+ * File: BaseVehicleTempstateFeignFallback.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateFeignFallback <br/>
+ * Description: 车辆临时状态表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(PagerQuery<BaseVehicleTempstateQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口comc/basevehicletempstate/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehicleTempstateDto dto){
+		return ResultBean.fireFail().setMsg("接口comc/basevehicletempstate/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口comc/basevehicletempstate/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口comc/basevehicletempstate/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean delByBusSid(String businessSid) {
+		return null;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateQuery.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateQuery.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateQuery <br/>
+ * Description: 车辆临时状态表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆临时状态表 查询条件", description = "车辆临时状态表 查询条件")
+public class BaseVehicleTempstateQuery implements Query {
+
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+	@ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicletempstate;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateVo.java <br/>
+ * Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateVo <br/>
+ * Description: 车辆临时状态表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象")
+public class BaseVehicleTempstateVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+	@ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.base.api.busvehicleapply.flow;
 
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * @Author dimengzhe
@@ -16,10 +18,11 @@ public class GetNodeQuery implements Query {
     private static final long serialVersionUID = -5674867230708197611L;
 
     @ApiModelProperty(value = "环节定义id")
-    @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
     @ApiModelProperty(value = "业务sid")
     private String businessSid;
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 
  /*   @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;*/

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

@@ -109,4 +109,6 @@ public class CommonContract extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("生成的合同的url")
+    private String commonContractUrl;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@@ -111,7 +111,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
 		BusinessVariables bv = new BusinessVariables();
 		BeanUtil.copyProperties(query, bv);
 		bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
-		return baseAccadjApplyService.complete(bv);
+		return baseAccadjApplyService.complete(bv,query.getBaseInternalPurchaseVehicles());
 	}
 
 	@Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -317,7 +317,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             bv.setTaskDefKey(baseAccadjApply.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
+            return complete(bv,baseInternalPurchaseVehicles);
         }
         return rb;
     }
@@ -360,12 +361,26 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         return baseMapper.updateFlowFiled(map);
     }
 
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
         ResultBean rb = ResultBean.fireFail();
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
         String callInOrgSid = baseAccadjApply.getCallInOrgSid();
         String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
         List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+        Boolean i = false;
+        if (baseInternalPurchaseVehicles.size() > 0){
+            for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String sid = baseInternalPurchaseVehicle.getSid();
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
+                String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
+                if (!witPinMoney.equals(witPinMoney1)){
+                    i = true;
+                    break;
+                }
+            }
+        }
+        bv.getFormVariables().put("isAdj",i);
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -562,6 +577,21 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
+        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles();
+        Boolean i = false;
+        if (baseInternalPurchaseVehicles.size() > 0){
+            for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String sid = baseInternalPurchaseVehicle.getSid();
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
+                String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
+                if (!witPinMoney.equals(witPinMoney1)){
+                    i = true;
+                    break;
+                }
+            }
+        }
+        bv.getFormVariables().put("isAdj",i);
         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());

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

@@ -290,72 +290,30 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
          * 退料组织:FStockOrgId  (必填项)
          */
         purMrb.setFStockOrgId("101");
-        /**
-         * 需求组织:FRequireOrgId  (必填项)
-         */
-        //purMrb.setFRequireOrgId( "101");
-        /**
-         * 采购组织:FPurchaseOrgId  (必填项)
-         */
-        //purMrb.setFPurchaseOrgId("101");
         /**
          * 供应商:FSupplierID  (必填项)
          */
         purMrb.setFSupplierID("010001");
-        /**
-         * 接收方:FACCEPTORID
-         */
-        //purMrb.setFACCEPTORID("010001");
-        /**
-         * 结算方:FSettleId
-         */
-        //purMrb.setFSettleId("010001");
-        /**
-         * 收款方:FCHARGEID
-         */
-        //purMrb.setFCHARGEID("010001");
-        /**
-         * 货主:FOwnerIdHead  (必填项)
-         */
-        //purMrb.setFOwnerIdHead("101");
-        /**
-         * 结算组织:FSettleOrgId  (必填项)
-         */
-        //purMrb.setFSettleOrgId("101");
+
         List<PurMrb.FPURMRBENTRY> FPURMRBENTRY=new ArrayList<>();
+
         PurMrb.FPURMRBENTRY fp=new PurMrb.FPURMRBENTRY();
         /**
          * 物料编码:FMATERIALID  (必填项)
          */
-        fp.setFMATERIALID(" JX091054");
+        fp.setFMATERIALID(baseVehicle.getVinNo());
         /**
          * 物料说明:FMaterialDesc
          */
-        fp.setFMaterialDesc("X牵引6*4-550超");
-        /**
-         * 库存单位:FUnitID  (必填项)
-         */
-       // fp.setFUnitID("liang");
+        fp.setFMaterialDesc(baseVehicle.getConfigName());
         /**
          * 批号:FLot
          */
-        fp.setFLot("liang");
+        fp.setFLot(baseVehicle.getVinNo());
         /**
          * 实退数量:FRMREALQTY
          */
-        fp.setFRMREALQTY(1.0);
-        /**
-         * 补料数量:FREPLENISHQTY
-         */
-        //fp.setFREPLENISHQTY(1.0);
-        /**
-         * 扣款数量:FKEAPAMTQTY
-         */
-        //fp.setFKEAPAMTQTY(1.0);
-        /**
-         * 计价单位:FPRICEUNITID  (必填项)
-         */
-        //fp.setFPRICEUNITID("liang");
+       // fp.setFRMREALQTY(1.0);
         /**
          * 仓库:FSTOCKID
          */
@@ -364,22 +322,6 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
          * 库存状态:FStockStatusId
          */
         fp.setFStockStatusId("KCZT01_SYS");
-        /**
-         * 计价基本数量:FPriceBaseQty
-         */
-        //fp.setFPriceBaseQty(1.0);
-        /**
-         * 采购单位:FCarryUnitId  (必填项)
-         */
-        //fp.setFCarryUnitId("liang");
-        /**
-         * 采购数量:FCarryQty
-         */
-        //fp.setFCarryQty(1.0);
-        /**
-         * 采购基本数量:FCarryBaseQty
-         */
-        //fp.setFCarryBaseQty(1.0);
         FPURMRBENTRY.add(fp);
         /**
          * 物料列表

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

@@ -650,12 +650,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         List<StkInStock.FInStockEntry> FInStockEntry=new ArrayList<>();
         StkInStock.FInStockEntry fise=new StkInStock.FInStockEntry();
         fise.setFMaterialId(" JX091054");
-        fise.setFRealQty(1.0);
+        //fise.setFRealQty(1.0);
       //  fise.setFPriceUnitQty("0");
       //  fise.setFRemainInStockQty(1.0);
         fise.setFLot("1234567890");
         fise.setFStockId("CK001");
-        fise.setFUnitID("liang");
+       // fise.setFUnitID("liang");
         FInStockEntry.add(fise);
         stkInStock.setFInStockEntry(FInStockEntry);
         return stkInStock;

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

@@ -18,6 +18,8 @@ import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateServi
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -81,7 +83,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Autowired
     private BaseVehicleCertificateService baseVehicleCertificateService;
-
+    /**
+     * 财务模块中的金蝶接口
+     */
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
     @Override
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@@ -94,7 +100,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 DateTime currentDate = DateUtil.parse(today);
                 int i = priceDate.compareTo(currentDate);
                 long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
-                record.setLibraryAge(betweenDay*i*-1);
+                record.setLibraryAge(betweenDay * i * -1);
             }
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
@@ -180,6 +186,65 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode()))
                 baseVehicleService.saveVeh_tc(baseVehicle);
         }
+        //入账生成台账  //外采入库生成台账
+       try{
+           if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())||eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
+               StkInStock stkInStock=new StkInStock();
+               /**
+                *  // 入库日期:FDate  (必填项)
+                */
+               stkInStock.setFDate(DateUtil.now());
+               /**
+                *   // 采购部门:FPurchaseDeptId  (必填项)
+                */
+               stkInStock.setFPurchaseDeptId("05.04");
+               /**
+                *  //采购组织:FPurchaseOrgId  (必填项)
+                */
+               stkInStock.setFPurchaseOrgId("100012");
+               /**
+                * // 供应商:FSupplierId  (必填项)
+                */
+               stkInStock.setFSupplierId("010001");
+               /**
+                *  //分配目标组织:TOrgId  (必填项)
+                */
+               stkInStock.setTOrgId("100012");
+               /**
+                * // 物料列表:FInStockEntry  (必填项)
+                */
+               List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>();
+               for (BaseVehicleDto baseVehicleDto : dto) {
+                   StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry();
+                   /**
+                    * 车辆类型
+                    */
+                   sf.setCllx("03");
+                   /**
+                    *   //  批号:FLot
+                    */
+                   sf.setFLot("11112222");
+                   /**
+                    *  // 物料编码:FMaterialId  (必填项)
+                    */
+                   sf.setFMaterialId(baseVehicleDto.getVinNo());
+                   /**
+                    *   //  仓库:FStockId
+                    */
+                   sf.setFStockId("CK001");
+                   /**
+                    * 物料分组
+                    */
+                   sf.setWlfz("01");
+                   fInStockEntry.add(sf);
+               }
+               stkInStock.setFInStockEntry(fInStockEntry);
+               finKingDeeFeign.draftStkInStock(stkInStock);
+           }
+       }catch (Exception e){
+           e.printStackTrace();
+       }
+
         return rb.success().setMsg("保存成功");
     }
 

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

@@ -27,6 +27,8 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -1773,6 +1775,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getUseOrgSid())) {
             qw.eq("bv.createOrgSid", params.getUseOrgSid());
         }
+        if (params.getVins().size() > 0) {
+            qw.notIn("bv.vinNo", params.getVins());
+        }
         qw.eq("bv.isDelete", 0);
         //库存或调入或采购退库中
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
@@ -1915,6 +1920,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             baseVehicleCertificate.setUseOrgName(baseVehicle.getUseOrgName());
             baseVehicleCertificateService.save(baseVehicleCertificate);
             return rb.success().setMsg("入账新增车辆台账数据成功");
+
         }
         return rb.setMsg("入账新增车辆台账据失败");
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehicletempstate;
+
+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.basevehicletempstate.BaseVehicleTempstate;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateMapper.java <br/>
+ * Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateMapper <br/>
+ * Description: 车辆临时状态表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempstate> {
+
+    //@Update("update base_vehicle_tempstate set name=#{msg} where id=#{id}")
+    //IPage<BaseVehicleTempstateVo> voPage(IPage<BaseVehicleTempstate> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleTempstate> qw);
+
+    IPage<BaseVehicleTempstateVo> selectPageVo(IPage<BaseVehicleTempstate> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleTempstate> qw);
+
+    List<BaseVehicleTempstateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleTempstate> qw);
+
+    @Select("select * from base_vehicle_tempstate")
+    List<BaseVehicleTempstateVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml

@@ -0,0 +1,15 @@
+<?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.basevehicletempstate.BaseVehicleTempstateMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo">
+        SELECT * FROM base_vehicle_tempstate
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo">
+        SELECT * FROM base_vehicle_tempstate
+        <where>${ew.sqlSegment}</where>
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehicletempstate;
+
+import com.yxt.anrui.base.api.basevehicletempstate.*;
+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.*;
+
+
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateFeignFallback.java <br/>
+ * Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateRest <br/>
+ * Description: 车辆临时状态表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车辆临时状态表")
+@RestController("aaaa.biz.basevehicletempstate.BaseVehicleTempstateRest")
+@RequestMapping("v1/basevehicletempstate")
+public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
+
+	@Autowired
+	private BaseVehicleTempstateService baseVehicleTempstateService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehicleTempstateVo> pv = baseVehicleTempstateService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehicleTempstateDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehicleTempstateService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehicleTempstateService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehicleTempstateDetailsVo vo = baseVehicleTempstateService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean delByBusSid(String businessSid) {
+		ResultBean rb = ResultBean.fireFail();
+		baseVehicleTempstateService.delByBusSid(businessSid);
+		return rb.success();
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehicletempstate;
+
+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.basevehicletempstate.*;
+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 org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: comc(comc) <br/>
+ * File: BaseVehicleTempstateService.java <br/>
+ * Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateService <br/>
+ * Description: 车辆临时状态表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-06 09:07:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleTempstateMapper, BaseVehicleTempstate> {
+    private QueryWrapper<BaseVehicleTempstate> createQueryWrapper(BaseVehicleTempstateQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseVehicleTempstate> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseVehicleTempstateVo> listPageVo(PagerQuery<BaseVehicleTempstateQuery> pq) {
+        BaseVehicleTempstateQuery query = pq.getParams();
+        QueryWrapper<BaseVehicleTempstate> qw = createQueryWrapper(query);
+        IPage<BaseVehicleTempstate> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehicleTempstateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseVehicleTempstateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BaseVehicleTempstateDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BaseVehicleTempstateDto dto) {
+        BaseVehicleTempstate entity = new BaseVehicleTempstate();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BaseVehicleTempstateDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BaseVehicleTempstate entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BaseVehicleTempstateDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseVehicleTempstate entity = fetchBySid(sid);
+        BaseVehicleTempstateDetailsVo vo = new BaseVehicleTempstateDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void delByBusSid(String businessSid) {
+        deleteBySid(businessSid);
+    }
+}

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

@@ -77,7 +77,7 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
      * @param staffSid
      * @return
      */
-    AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid, @Param("staffSid") String staffSid);
+    AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid);
 
     int selectNum(String bill);
 

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

@@ -94,10 +94,12 @@
                contractAmount AS contractPrice,
                customerSid,
                appdixUrl,
-               sceneSignUrl
+               sceneSignUrl,
+                taskId,
+                procInstId as procInsId,
+        staffSid as userSid
         FROM common_contract
         WHERE sid = #{contractSid}
-          AND staffSid = #{staffSid}
     </select>
 
     <!--根据sid批量删除品牌管理列表数据-->

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

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
-import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
@@ -1028,9 +1026,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      * @return
      */
     public AppCommonContractInitVo getContractInfo(String contractSid, String userSid) {
-        AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, userSid);
+        AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid);
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        vo.setUserSid(userSid);
         if (StringUtils.isNotBlank(vo.getAppdixUrl())) {
             String[] split1 = vo.getAppdixUrl().split(",");
             List<String> contract = new ArrayList<>();
@@ -1176,7 +1173,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-        appMap.put("sid", businessSid);
+        appMap.put("contractSid", businessSid);
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.CONTRACTAPPLY.getProDefId());
@@ -1330,6 +1327,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //生成合同编号
         String contractNo = getApplyCode(dto.getUserSid());
         map.put("contractNo", contractNo);
+        String url = "";
         try {
             ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                     .setNameFormat("demo-pool-%d").build();
@@ -1349,6 +1347,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 }
                 printConfirmVo.setDownloadUrl(future1.get());
                 list.add(printConfirmVo);
+                if (StringUtils.isNotBlank(future1.get())) {
+                    if (future1.get().contains(docPdfComponent.getPrefixTemplateUrl())) {
+                        url = future1.get().replace(docPdfComponent.getPrefixTemplateUrl(), "");
+                    }
+                }
             }
             Future<String> future2 = pool.submit(() -> {
                 return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
@@ -1362,8 +1365,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 }
                 printConfirmVo.setDownloadUrl(future2.get());
                 list.add(printConfirmVo);
+                if (StringUtils.isNotBlank(future2.get())) {
+                    if (future2.get().contains(docPdfComponent.getPrefixTemplateUrl())) {
+                        url = url + "," + future2.get().replace(docPdfComponent.getPrefixTemplateUrl(), "");
+                    }
+                }
             }
             //生成合同数据
+            String finalUrl = url;
             Future<String> future3 = pool.submit(() -> {
                 //新增合同信息
                 CommonContract commonContract = new CommonContract();
@@ -1400,6 +1409,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 commonContract.setPrice(new BigDecimal(transactionPrice));
                 //单台订金
                 commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
+                commonContract.setCommonContractUrl(finalUrl);
                 save(commonContract);
                 return commonContract.getSid();
             });
@@ -1430,7 +1440,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CommonContract commonContract = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid", businessSid);
+        appMap.put("contractSid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(commonContract.getTaskId())) {
@@ -1514,7 +1524,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("sid", businessSid);
+                appMap.put("contractSid", businessSid);
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);

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

@@ -101,6 +101,7 @@
                 </if>
             </where>
         </if>
+        order by bmd.id desc
     </select>
 
     <delete id="deleteVirtualOrder">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -273,6 +273,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                         vo.setRemainderMoney((new BigDecimal(deposit).subtract(new BigDecimal(useDeposit))).toString());
                     } else {
                         vo.setRemainderMoney(deposit);
+                        vo.setUsePeposit("0");
                     }
                 }
             }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/purmrb/PurMrb.java

@@ -98,9 +98,9 @@ public class PurMrb {
         public String FLot;
         /**
          * 实退数量:FRMREALQTY
-         */@NotBlank
-        @JsonProperty("FRMREALQTY")
-        public double FRMREALQTY;
+         *///@NotBlank
+        //@JsonProperty("FRMREALQTY")
+        //public double FRMREALQTY;
         /**
          * 补料数量:FREPLENISHQTY
          *///@NotBlank

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java

@@ -15,12 +15,16 @@ import java.util.List;
 @Data
 public class StkInStock {
     public String sid;
+    /**
+     *  //分配目标组织:TOrgId  (必填项)
+     */@JsonProperty("TOrgId")
+    @NotBlank
+    public String TOrgId;
     /**
      *  //采购组织:FPurchaseOrgId  (必填项)
      */@JsonProperty("FPurchaseOrgId")
     @NotBlank
     public String FPurchaseOrgId;
-
     /**
      * // 收料组织:FStockOrgId  (必填项)
      *///@JsonProperty("FStockOrgId")
@@ -77,7 +81,16 @@ public class StkInStock {
 
     @Data
     public static class FInStockEntry{
-
+        /**
+         * 物料分组
+         */
+        @NotBlank
+        public String wlfz;
+        /**
+         * 车辆类型
+         */
+        @NotBlank
+        public String cllx;
         /**
          *  // 物料编码:FMaterialId  (必填项)
          */@JsonProperty("FMaterialId")
@@ -86,15 +99,15 @@ public class StkInStock {
 
         /**
          *   // 库存单位:FUnitID  (必填项)
-         */@JsonProperty("FUnitID")
-        @NotBlank
-        public String FUnitID="liang";
+         *///@JsonProperty("FUnitID")
+        //@NotBlank
+        //public String FUnitID="liang";
 
         /**
          *   // 实收数量:FRealQty
-         */@JsonProperty("FRealQty")
-        @NotBlank
-        public double FRealQty;
+         *///@JsonProperty("FRealQty")
+        //@NotBlank
+        //public double FRealQty;
 
         /**
          *   // 计价数量:FPriceUnitQty

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java

@@ -254,6 +254,18 @@ public class FinKingDeeService {
         ResultBean<String> kingDeeBillDataByNumber = getKingDeeBillDataByNumber(formId, number);
         return kingDeeBillDataByNumber;
     }
+
+    public ResultBean<String> getKingBillDataInfoList(String formId,String jsonParam) {
+       /* String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
+                "\\\"FieldKeys\\\":\\\"\\\",\\\"FilterString\\\":\\\"FName=''\\\",\\\"OrderString\\\":\\\"\\\"," +
+                "\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"0\\\"}";*/
+        KingDeeParams kdp = getKingDeeParams(formId, jsonParam);
+        log.info("kdp:{}",JSONObject.toJSONString(kdp));
+        ResultBean<String> listResultBean = KingDeeSaveSKD.getKingBillDataInfoList(kdp);
+        log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean));
+        return listResultBean;
+    }
+
     /**
      * 调用金蝶接口的数据格式
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java

@@ -68,6 +68,9 @@ public class KingDeeSaveSKD {
     private static String Allocate_URL = url+"DynamicFormService.Allocate.common.kdsvc";
     //查看单据接口的地址
     private static String View_URL = url+"DynamicFormService.View.common.kdsvc";
+    //查询单据接口的地址
+    private static String ExecuteBillQuery_URL = url+"DynamicFormService.ExecuteBillQuery.common.kdsvc";
+
     //登录，校验用户的API接口地址
     private static String Login_URL = url+"AuthService.ValidateUser.common.kdsvc";
 
@@ -271,6 +274,50 @@ public class KingDeeSaveSKD {
         return rb;
     }
 
+    /**
+     * 单据查询
+     * @param jsonParam
+     * @return
+     */
+    public static ResultBean<String> getKingBillDataInfoList(FinKingDeeService.KingDeeParams jsonParam) {
+        ResultBean<String > rb= ResultBean.fireFail();
+        // 定义httpClient的实例
+        HttpClient httpclient = new DefaultHttpClient();
+        /********** 用户登录Begin ************************/
+        ResultBean<List<KingDeeResult>> rb1 = loginKingDeeSystem(httpclient);
+        if (!rb1.getSuccess()) return rb;
+        try {
+            URI save_uri = new URI(ExecuteBillQuery_URL);
+            HttpPost method = new HttpPost(save_uri);
+            //采购入库单保存参数
+            log.info("jsonParam:{}",JSON.toJSON(jsonParam.getData()));
+            //StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8");"{\\\"FormId\\\":\\\"BD_MATERIAL\\\",\\\"TopRowCount\\\":0,\\\"Limit\\\":10,\\\"StartRow\\\":0,\\\"FilterString\\\":\\\"FNumber=' JX091054'\\\",\\\"OrderString\\\":\\\"FID ASC\\\",\\\"FieldKeys\\\":\\\"FUseOrgId,FNumber\\\"}"
+            StringEntity entity = new StringEntity("{\\\"FormId\\\":\\\"BD_MATERIAL\\\",\\\"FieldKeys\\\":\\\"FName\\\",\\\"FilterString\\\":\\\"\\\",\\\"OrderString\\\":\\\"\\\",\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"10\\\"}", "utf-8");
+            log.info(JSON.toJSONString(entity));
+            entity.setContentEncoding("UTF-8");
+            entity.setContentType("application/json");
+            //把成功登录的Session信息传进去，获取连接信息
+            method.setHeader(sessionkey, sessionValue);
+            method.setHeader(aspnetsessionkey, aspnetsessionValue);
+            //方法参数
+            method.setEntity(entity);
+            HttpResponse result = httpclient.execute(method);
+            // 请求发送成功，并得到响应
+            if (result.getStatusLine().getStatusCode() == 200) {
+                log.info("请求成功");
+                // 读取服务器返回过来的json字符串数据
+                String str = EntityUtils.toString(result.getEntity());
+                if(StringUtils.isBlank(str)){
+                    return rb.setMsg("操作失败");
+                }
+                log.info(str);
+                return  rb.success().setData(str);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return rb;
+    }
     /**
      * 查看金蝶数据
      * @param jsonParam
@@ -323,8 +370,8 @@ public class KingDeeSaveSKD {
             //登录请求参数
             Map<String,String> loginParams=new HashMap<>();
             loginParams.put("acctID",acctID);
-            loginParams.put("userName",userName_administrator);
-            loginParams.put("password",password_administrator);
+            loginParams.put("userName",userName);
+            loginParams.put("password",password);
             loginParams.put("lcid",lcid);
             String jsonParamdl=JSON.toJSONString(loginParams);
             StringEntity entity = new StringEntity(jsonParamdl, "utf-8");
@@ -410,4 +457,5 @@ public class KingDeeSaveSKD {
         return new ResultBean<List<KingDeeResult>> (aBoolean,"操作成功!","200").setData(list);
     }
 
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json

@@ -3,6 +3,7 @@
   "FCreateOrgId": {
     "FNumber": "100"
   },
+  "FNumber": "@KD_FName",
   "FUseOrgId": {
     "FNumber": "100"
   },

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/data_FPURMRBENTRY.json

@@ -24,7 +24,7 @@
   },
   "FIsReceiveUpdateStock": false,
   "FGiveAway": false,
-  "FPriceBaseQty": @KD_FRMREALQTY,
+  "FPriceBaseQty": 1.0,
   "FCarryUnitId": {
     "FNumber": "@KD_FCarryUnitId"
   },

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java

@@ -1,21 +1,29 @@
 package com.yxt.anrui.fin.biz.kingdee.stkinstock;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
+import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
+import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
+import com.yxt.anrui.fin.biz.kingdee.bdmaterial.BdMaterialService;
 import com.yxt.common.core.result.ResultBean;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Service
+@Slf4j
 public class STKInStockService extends FinKingDeeService {
-
+    @Resource
+    private BdMaterialService bdMaterialService;
     /**
      * 保存采购入库单
      *  @param stkInStock
@@ -23,6 +31,47 @@ public class STKInStockService extends FinKingDeeService {
      */
     public ResultBean draftStkInStock(StkInStock stkInStock) {
        // stkInStock=StkInStock.createStkInStock();
+        List<StkInStock.FInStockEntry> fInStockEntry1 = stkInStock.getFInStockEntry();
+        for (StkInStock.FInStockEntry f: fInStockEntry1){
+            ResultBean<String> kingDataInfoByNumber = getKingDataInfoByNumber(KingDeeBillId.BD_MATERIAL.getID(), f.getFMaterialId());
+            log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
+            JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData());
+            JSONObject result = (JSONObject)jsonObject.get("Result");
+            JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
+            if(responseStatus!=null){
+                //不存在该物料
+                log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
+                BdMaterial bdMaterial=new BdMaterial();
+                bdMaterial.setFName(f.getFMaterialId());
+                bdMaterial.setF_PAEZ_Base(f.getCllx());
+                bdMaterial.setFMaterialGroup(f.getWlfz());
+                bdMaterial.setTOrgIds(stkInStock.getTOrgId());
+                bdMaterialService.draftBdMaterial(bdMaterial);
+            }else{
+                //存在该物料
+                log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
+                JSONObject result2 = (JSONObject)result.get("Result");
+                Integer Id = (Integer)result2.get("Id");
+                log.info("Id:{}",Id);
+                String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
+                        "\\\"FieldKeys\\\":\\\"FUseOrgId\\\",\\\"FilterString\\\":\\\"FNumber='"+f.getFMaterialId()+"'\\\",\\\"OrderString\\\":\\\"\\\"," +
+                        "\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"100\\\"}";
+                ResultBean<String> kingBillDataInfoList = getKingBillDataInfoList(KingDeeBillId.BD_MATERIAL.getID(), jsonParam);
+                //if(kingBillDataInfoList.getData().indexOf(stkInStock.getTOrgId())<0){
+                    String data="{\"formId\":\""+KingDeeBillId.BD_MATERIAL.getID()+"\"," +
+                            "\"data\":\"{\\\"PkIds\\\":\\\""+Id+"\\\",\\\"TOrgIds\\\":\\\""+stkInStock.getTOrgId()+"\\\"," +
+                            "\\\"IsAutoSubmitAndAudit\\\":\\\"true\\\"}\"}";
+                    ResultBean<List<KingDeeResult>> resultBean3 =allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(),data);// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate);
+                    if(!resultBean3.getSuccess()){
+                        log.info("物料分配失败!");
+                       // return resultBean3.setMsg("物料分配失败!");
+                    }
+                    log.info("物料分配成功!");
+                    log.info("resultBean3:{}",resultBean3);
+              //  }
+            }
+        }
+       // ResultBean<String> kingBillDataInfoList = bdMaterialService.getKingBillDataInfoList(KingDeeBillId.BD_MATERIAL, "");
         ResultBean rb=ResultBean.fireFail();
         try {
             //业务表的主表数据集合

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json

@@ -4,11 +4,11 @@
     "FNumber": "@KD_FMaterialId"
   },
   "FUnitID": {
-    "FNumber": "@KD_FUnitID"
+    "FNumber": "liang"
   },
-  "FRealQty": @KD_FRealQty,
+  "FRealQty": 1.0,
   "FPriceUnitID": {
-    "FNumber": "@KD_FUnitID"
+    "FNumber": "liang"
   },
   "FLot": {
     "FNumber": "@KD_Flot"
@@ -26,11 +26,11 @@
   "FIsReceiveUpdateStock": false,
   "FPriceBaseQty": 1.0,
   "FRemainInStockUnitId": {
-    "FNumber": "@KD_FUnitID"
+    "FNumber": "liang"
   },
   "FBILLINGCLOSE": false,
-  "FPriceUnitQty":@KD_FRealQty,
-  "FRemainInStockQty":@KD_FRealQty,
+  "FPriceUnitQty":1.0,
+  "FRemainInStockQty":1.0,
   "FAPNotJoinQty": 1.0,
   "FRemainInStockBaseQty": 1.0
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -5,10 +5,10 @@ package com.yxt.anrui.flowable.api.utils;
  */
 public enum ProcDefEnum {
 
-    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:2:487504"),
-    ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:3:487508"),
+    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+    ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
-    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
+//    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
     SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
     ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
@@ -29,7 +29,7 @@ public enum ProcDefEnum {
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
     FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
-    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:400012"),
+    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:567508"),
     BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),

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

@@ -1266,9 +1266,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 latestTaskVo.setASSIGNEE_(item.getAssignee());
 //                latestTaskVo.setId_(item.getId());
                 latestTaskVo.setId_(listResultBean_2!=null?listResultBean_2.getData().get(0).getId_():id_);
-                if(b){
+                //if(b){
                   //  taskService.setAssignee(id_, assignee_);
-                }
+               // }
                 latestTaskVo.setName_(listResultBean_2!=null?listResultBean_2.getData().get(0).getName_():item.getName());
                 latestTaskVo.setTask_def_key_(listResultBean_2!=null?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
                 latestTaskVo.setIncomingSourceRef(listResultBean_2!=null?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -123,12 +123,16 @@ public class ScmApplyInbound extends BaseEntity {
     private String num;
     @ApiModelProperty("扣减运费")
     private String deductionFreight;
-    @ApiModelProperty("计算政策2:扣减政策1")
-    private String deductionPolicyTwoOne;
     @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策4:扣减政策1")
     private String deductionPolicyThreeOne;
-    @ApiModelProperty("计算政策3:扣减政策2")
+    @ApiModelProperty("计算政策4:扣减政策2")
     private String deductionPolicyThreeTwo;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwoo;
+    @ApiModelProperty("计算政策4:扣减政策3")
+    private String deductionPolicyFourThree;
     @ApiModelProperty(value = "采购类型key")
     private String manPurOrderTypeKey;
     @ApiModelProperty(value = "采购类型value")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -137,12 +137,16 @@ public class ScmApplyInboundDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("扣减运费")
     private String deductionFreight;
-    @ApiModelProperty("计算政策2:扣减政策1")
-    private String deductionPolicyTwoOne;
     @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策4:扣减政策1")
     private String deductionPolicyThreeOne;
-    @ApiModelProperty("计算政策3:扣减政策2")
+    @ApiModelProperty("计算政策4:扣减政策2")
     private String deductionPolicyThreeTwo;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwoo;
+    @ApiModelProperty("计算政策4:扣减政策3")
+    private String deductionPolicyFourThree;
     @ApiModelProperty(value = "采购类型key")
     private String manPurOrderTypeKey;
     @ApiModelProperty(value = "采购类型value")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -133,12 +133,16 @@ public class ScmApplyInboundVo implements Vo {
     private Date priceDate;
     @ApiModelProperty("扣减运费")
     private String deductionFreight;
-    @ApiModelProperty("计算政策2:扣减政策1")
-    private String deductionPolicyTwoOne;
     @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策4:扣减政策1")
     private String deductionPolicyThreeOne;
-    @ApiModelProperty("计算政策3:扣减政策2")
+    @ApiModelProperty("计算政策4:扣减政策2")
     private String deductionPolicyThreeTwo;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwoo;
+    @ApiModelProperty("计算政策4:扣减政策3")
+    private String deductionPolicyFourThree;
     @ApiModelProperty(value = "采购类型key")
     private String manPurOrderTypeKey;
     @ApiModelProperty(value = "采购类型value")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java

@@ -40,5 +40,4 @@ public class SubmitScmApplyInboundDto extends ScmApplyInboundDto {
     private String orgSidPath;
     @ApiModelProperty("员工sid")
     private String staffSid;
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java

@@ -19,7 +19,7 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto {
     private List<String> images;
 
     @ApiModelProperty("保单照片")
-    private String policyImages;
+    private List<String> policyImages;
 
     @ApiModelProperty("临牌")
     private String proCard;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java

@@ -63,10 +63,10 @@ public class AppScmVehicleGressionDto implements Dto {
     private List<String> vins;
     @ApiModelProperty("申请编号")
     private String applicantNo;
-    @ApiModelProperty("申请人")
-    private String applicantName;
-    @ApiModelProperty("申请日期")
-    private String applicantDate;
+//    @ApiModelProperty("申请人")
+//    private String applicantName;
+//    @ApiModelProperty("申请日期")
+//    private String applicantDate;
     @ApiModelProperty("现存地点")
     private String location;
     @ApiModelProperty("现存放地点")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -33,7 +34,11 @@ public class ScmVehicleGressionPageVo implements Vo {
     private String downloadUrl;
 
     @ApiModelProperty("现场照片")
-    private List<String> images;
+    private List<String> images = new ArrayList<>();
+    @ApiModelProperty("保单照片")
+    private List<String> policyImage = new ArrayList<>();
+    @ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
 
     @ApiModelProperty("是否显示删除 流程未提交时 显示")
     private boolean showDetectBtn;

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

@@ -179,10 +179,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             ScmApplyInbound inboundVehicle = new ScmApplyInbound();
             BeanUtil.copyProperties(dto, inboundVehicle);
             inboundVehicle.setSid(UUID.randomUUID().toString());
-            String userSid = dto.getUserSid();
+            /*String userSid = dto.getUserSid();
             ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
             String createOrgSid = pathSidByUserSid.getData();
-            inboundVehicle.setUseOrgSid(createOrgSid);
+            inboundVehicle.setUseOrgSid(createOrgSid);*/
             save(inboundVehicle);
             // 保存车辆列表
             //scmApplyInboundVehicleService.saveApplyInboundVehicleList(vehicleList, inboundVehicle.getSid(), inboundVehicle.getModelSid());
@@ -356,10 +356,27 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         //用户的组织全路径
         String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         String busSid = dto.getSid();
+        List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
         if (StringUtils.isBlank(busSid)) {
             Map<String, Object> variables = BeanUtil.beanToMap(dto);
             ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert
             String businessSid = resultBean.getData().toString();
+            ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
+            List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
+            ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
+            for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+                String vinNo = scmApplyInboundVehicleDto.getVinNo();
+                if (StringUtils.isBlank(vinNo)){
+                    scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
+                    BeanUtil.copyProperties(scmApplyInbound,scmApplyInboundDto);
+                    scmApplyInboundDto.setSid(null);
+                    scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
+                }
+            }
+            if (scmApplyInboundVehicleDtos1.size() > 0){
+                scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
+                saveOrUpdateApplyInBound(scmApplyInboundDto);
+            }
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(dto, bv);
             bv.setOrgSidPath(orgSidPath);
@@ -378,6 +395,27 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
 
     private synchronized ResultBean submitBusinessData(SubmitScmApplyInboundDto dto, String businessSid, String orgSidPath) {
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
+        List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
+        List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos2 = new ArrayList<>();
+        ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
+        List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
+        for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+            String vinNo = scmApplyInboundVehicleDto.getVinNo();
+            if (StringUtils.isBlank(vinNo)){
+                scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
+                BeanUtil.copyProperties(scmApplyInbound,scmApplyInboundDto);
+                scmApplyInboundDto.setSid(null);
+                scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
+            }else {
+                scmApplyInboundVehicleDtos2.add(scmApplyInboundVehicleDto);
+            }
+        }
+        if (scmApplyInboundVehicleDtos1.size() > 0){
+            scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
+            scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
+            saveOrUpdateApplyInBound(scmApplyInboundDto);
+        }
         ScmApplyInbound entity = this.fetchBySid(dto.getSid());
         String businessTaskid = entity.getTaskId();
         BusinessVariables bv = new BusinessVariables();
@@ -390,12 +428,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId());
         bv.setInstanceId(entity.getProcInsId());
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
+            dto.setVehicleList(scmApplyInboundVehicleDtos2);
             saveOrUpdateApplyInBound(dto);
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
         } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
+            dto.setVehicleList(scmApplyInboundVehicleDtos2);
             saveOrUpdateApplyInBound(dto);
             bv.setTaskDefKey(entity.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
@@ -535,7 +575,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){
                 StkInStock.FInStockEntry fise=new StkInStock.FInStockEntry();
                 fise.setFMaterialId(s.getVinNo());// 物料编码
-                fise.setFRealQty(1.0);// 实收数量
+                //fise.setFRealQty(1.0);// 实收数量
                 //fise.setFPriceUnitQty("1");// 计价数量
                 //fise.setFRemainInStockQty(1.0);//  采购数量
                 fise.setFLot("1234567890");//  批号

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@@ -114,7 +114,7 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
 
     String selectNum(String bill);
 
-    List<ScmVehicleGressionVo> getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid);
+    List<ScmVehicleGressionVo> getlastTimeEqual(@Param("sid") String sid, @Param("targetLocationSid") String targetLocationSid);
 
     @Select("SELECT count(*) FROM scm_vehicle_gression  WHERE useOrgSid = #{useOrgSid} and createBySid = #{userSid} and handleState = '1' ")
     int getToDoNum(@Param("useOrgSid") String useOrgSid, @Param("userSid") String userSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -33,7 +33,8 @@
         svg.targetLocation,
         svg.operator,
         svg.procDefId,
-        svg.procInstId
+        svg.procInstId,
+        svg.temporaryCard
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}
@@ -110,7 +111,7 @@
     <select id="getlastTimeEqual" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
         select *
         from scm_vehicle_gression
-        where vinNo = #{vinNo}
+        where sid = #{sid}
           and targetLocationSid = #{targetLocationSid}
           and LENGTH(nodeState) > 0
         order by id desc limit 1

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.scm.biz.scmvehiclegression;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 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;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 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;
@@ -136,6 +139,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     private MessageFeign messageFeign;
     @Autowired
     private ScmVehicleGressionVehService scmVehicleGressionVehService;
+    @Autowired
+    BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -192,7 +197,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @return
      */
     public IPage<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
-        String type = "05";
         IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
@@ -200,17 +204,26 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
+            String sid = record.getSid();
+            String type1 = "04"; //保单照片
+            String type2 = "05"; //现场照片
+            List<String> policyImage = new ArrayList<>();
+            List<String> image = new ArrayList<>();
             //查询出门证
             ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid());
             if (scmExitPermit != null) {
                 record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl());
             }
-            List<String> list1 = new ArrayList<>();
-            List<ScmFile> list = scmFileService.getByLinkSidAndType(record.getSid(), type);
-            for (ScmFile scmFile : list) {
-                list1.add(scmFile.getFilePath());
+            List<ScmFile> scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1);
+            for (ScmFile scmFile : scmFiles1) {
+                policyImage.add(scmFile.getFilePath());
+            }
+            record.setPolicyImage(policyImage);
+            List<ScmFile> scmFiles2 = scmFileService.getByLinkSidAndType(record.getSid(), type2);
+            for (ScmFile scmFile : scmFiles2) {
+                image.add(scmFile.getFilePath());
             }
-            record.setImages(list1);
+            record.setImages(image);
         }
         return iPage;
     }
@@ -397,26 +410,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 return rb.setMsg("该数据不存在");
             }
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
-//            if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
-//                List<String> factoryImage = dto.getPolicyImage();
-//                if (factoryImage.size() <= 0) {
-//                    return rb.setMsg("保单照片不能为空");
-//                }
-//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
-//                for (String s : factoryImage) {
-//                    if (s.contains(fileUploadComponent.getUrlPrefix())) {
-//                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
-//                    }
-//                    ScmFile scmFile = new ScmFile();
-//                    scmFile.setAttachType(type);
-//                    scmFile.setFileName("保单照片");
-//                    scmFile.setFilePath(s1);
-//                    scmFile.setLinkSid(scmVehicleGression.getSid());
-//                    scmFileService.save(scmFile);
-//                }
-//            } else if ("0".equals(dto.getInsuranceStateKey())) {
-//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
-//            }
             updateById(scmVehicleGression);
             scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
             List<String> vins = dto.getVins();
@@ -493,6 +486,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
         String vin = StringUtils.join(vins, StringUtils.LF);
         vo.setVinNo(vin);
+        vo.setVins(vins);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
         if (scmFiles1.size() > 0) {
             for (ScmFile scmFile : scmFiles1) {
@@ -551,16 +545,21 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String s2 = "";
         String type1 = "04";
         String type2 = "05";
-        if (StringUtils.isNotBlank(dto.getPolicyImages())) {
-            scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
-            String policyImages = dto.getPolicyImages();
-            s1 = policyImages.replace(fileUploadComponent.getUrlPrefix(), "");
-            ScmFile scmFile = new ScmFile();
-            scmFile.setAttachType(type1);
-            scmFile.setFileName("保单照片");
-            scmFile.setFilePath(s1);
-            scmFile.setLinkSid(dto.getSid());
-            scmFileService.save(scmFile);
+
+        scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
+        List<String> policyImages = dto.getPolicyImages();
+        if (policyImages.size() > 0) {
+            for (String policyImage : policyImages) {
+                if (policyImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    s1 = policyImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile = new ScmFile();
+                scmFile.setAttachType(type1);
+                scmFile.setFileName("保单照片");
+                scmFile.setFilePath(s1);
+                scmFile.setLinkSid(dto.getSid());
+                scmFileService.save(scmFile);
+            }
         }
         scmFileService.deleteByLinkSidAndType(dto.getSid(), type2);
         List<String> images = dto.getImages();
@@ -679,11 +678,24 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
-        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("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
-                    return rb.setMsg("该申请已存在，请勿重复提交！");
+        List<String> vins = dto.getVins();
+        for (String vin : vins) {
+            //推送车辆移库状态
+            BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData();
+            BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+            baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
+            baseVehicleTempstateDto.setTempStateKey("001");
+            baseVehicleTempstateDto.setBusSid(scmVehicleGression.getSid());
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+            List<String> sids = scmVehicleGressionVehService.fetchVoByVins(vin);
+            for (String sid : sids) {
+                List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
+                if (scmVehicleGressionVos.size() > 0) {
+                    if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
+                        if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                            return rb.setMsg("该申请中" + vin + "已存在，请勿重复提交！");
+                        }
+                    }
                 }
             }
         }
@@ -835,6 +847,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                //删除申请状态
+                baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
             }
 
             return rb.success().setData(resultBean.getData());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java

@@ -72,4 +72,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper<ScmVehicleGressi
 
     @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}")
     void deleteByMainSid(@Param("sid") String sid);
+
+    @Select("select * from scm_vehicle_gression_veh where vehVin =#{vin} ")
+    List<ScmVehicleGressionVehDetailsVo> fetchVoByVins(@Param("vin") String vin);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java

@@ -117,4 +117,13 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }
+
+    public List<String> fetchVoByVins(String vin) {
+        List<String> list = new ArrayList<>();
+        List<ScmVehicleGressionVehDetailsVo> vos = baseMapper.fetchVoByVins(vin);
+        for (ScmVehicleGressionVehDetailsVo vo : vos) {
+            list.add(vo.getMainSid());
+        }
+        return list;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java

@@ -19,7 +19,7 @@ public class AppCarTransferSiteImageDto implements Dto {
     private List<String> images;
 
     @ApiModelProperty("保单照片")
-    private String policyImages;
+    private List<String> policyImages;
 
     @ApiModelProperty("临牌")
     private String proCard;

doc/databases/base_tables_vehicle.sql

@@ -3,23 +3,47 @@
 DROP TABLE IF EXISTS `base_vehmodel_config`;
 CREATE TABLE `base_vehmodel_config`
 (
-    `id`                    int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`                   varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`           int(32)              DEFAULT '0' COMMENT '版本锁',
-    `createTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`              int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                 int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`              int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`               varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid`           varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid`           varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `modelSid`	            varchar(255)		 DEFAULT NULL COMMENT '车型sid',
-    `configurationItemsSid`	varchar(255)		 DEFAULT NULL COMMENT '简述配置sid',
-    `manufactorSettlementPrice`	varchar(255)	 DEFAULT NULL COMMENT '厂家结算价',
-    `salesReferencePrice`	varchar(255)	 DEFAULT NULL COMMENT '销售参考价',
-    `priceValidity`	        varchar(255)		 DEFAULT NULL COMMENT '价格有效期',
+    `id`                        int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                       varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`               int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`                timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`                timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`                  int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                     int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`                  int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                   varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`               varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`               varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `modelSid`                  varchar(255)         DEFAULT NULL COMMENT '车型sid',
+    `configurationItemsSid`     varchar(255)         DEFAULT NULL COMMENT '简述配置sid',
+    `manufactorSettlementPrice` varchar(255)         DEFAULT NULL COMMENT '厂家结算价',
+    `salesReferencePrice`       varchar(255)         DEFAULT NULL COMMENT '销售参考价',
+    `priceValidity`             varchar(255)         DEFAULT NULL COMMENT '价格有效期',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                         `id` (`id`)
 ) ENGINE = INNODB
-  DEFAULT CHARSET = utf8 COMMENT ='车型与简述配置关联表';
+  DEFAULT CHARSET = utf8 COMMENT ='车型与简述配置关联表';
+
+
+
+DROP TABLE IF EXISTS `base_vehicle_tempState`;
+CREATE TABLE `base_vehicle_tempState`
+(
+    `id`           int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`          varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`  int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`   timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`   timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`     int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`        int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`     int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`      varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`  varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`  varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `vehSid`       varchar(255)         DEFAULT NULL COMMENT '车辆sid',
+    `tempStateKey` varchar(255)         DEFAULT NULL COMMENT '数据字典项key,如移位申请中 001 状态',
+    `busSid`       varchar(255)         DEFAULT NULL COMMENT '业务sid',
+    PRIMARY KEY (`id`),
+    KEY            `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='车辆临时状态表';