Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basemanufacturerbank;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 14:07
+ * @Description
+ */
+@Data
+public class BaseManActualVo implements Vo {
+    private static final long serialVersionUID = -8356553970394175402L;
+    @ApiModelProperty("厂家销售通路")
+    private String accountName;
+
+    @ApiModelProperty("开户行")
+    private String depositBank;
+
+    @ApiModelProperty("收款银行账号")
+    private String bankAccount;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -46,4 +47,8 @@ public interface BaseManufacturerBankFeign {
     @ApiOperation("查看及修改回显（已测试）")
     @GetMapping("/selectDetails/{sid}")
     public ResultBean<BaseManufacturerBankVo> selectDetails(@PathVariable("sid") String sid);
+
+    @ApiOperation("未售买断获取厂家销售通路")
+    @GetMapping("/actualList/{useOrgSid}")
+    ResultBean<List<BaseManActualVo>> actualList(@PathVariable("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.basemanufacturerbank;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseManufacturerBankFeignFallback.java <br/>
@@ -28,4 +30,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
     public ResultBean<BaseManufacturerBankVo> selectDetails(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<BaseManActualVo>> actualList(String useOrgSid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,42 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicle;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "专项返利分配选择车辆 查询条件", description = "专项返利分配选择车辆 查询条件")
+public class BaseSpecialRebateDisGetVehQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+}

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

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicle;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象")
+public class BaseSpecialRebateDisGetVehVo implements Query {
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+    @ApiModelProperty("入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date priceDate;
+    @ApiModelProperty("销售日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date salesDate;
+    @ApiModelProperty(value = "买断日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date solidDate;
+}

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

@@ -51,4 +51,12 @@ public class BaseVehicleActualVo implements Vo {
     private String insideCode;
     @ApiModelProperty("库龄")
     private int dayNum;
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("排放标准")
+    private String emissionStandardValue;
 }

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

@@ -278,6 +278,11 @@ public interface BaseVehicleFeign {
     @PostMapping("/vehicleRebateList")
     ResultBean<PagerVo<BaseVehicleRebateVo>> vehicleRebateList(@RequestBody PagerQuery<BaseVehicleRebateQuery> pagerQuery);
 
+    @ApiOperation("专项返利分配选择车辆")
+    @PostMapping("/specialRebateDisGetVeh")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseSpecialRebateDisGetVehVo>> specialRebateDisGetVeh(@RequestBody PagerQuery<BaseSpecialRebateDisGetVehQuery> pq);
+
     @ApiOperation("销售订单选择现车分页列表")
     @PostMapping("/selectVo")
     ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(@RequestBody PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery);

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

@@ -181,6 +181,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseSpecialRebateDisGetVehVo>> specialRebateDisGetVeh(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -31,4 +32,15 @@ public class BaseVehicleActualDetails extends BaseEntity {
     private int dayNum;
     @ApiModelProperty("车辆数量")
     private int vehicleNum;
+
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("排放标准")
+    private String emissionStandardValue;
+    @ApiModelProperty("买断金额")
+    private BigDecimal actualMoney;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -31,4 +32,16 @@ public class BaseVehicleActualDetailsDto implements Dto {
     @ApiModelProperty("车辆数量")
     private int vehicleNum;
 
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("排放标准")
+    private String emissionStandardValue;
+
+    @ApiModelProperty("买断金额")
+    private String actualMoney;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/9 11:35
@@ -29,4 +31,16 @@ public class BaseVehicleActualDetailsVo implements Vo {
     private int dayNum;
     @ApiModelProperty("车辆数量")
     private int vehicleNum;
+
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("排放标准")
+    private String emissionStandardValue;
+
+    @ApiModelProperty("买断金额")
+    private String actualMoney;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:49
+ * @Description
+ */
+@Data
+public class BaseVehicleActualPay extends BaseEntity {
+    private static final long serialVersionUID = -3051690321206077883L;
+
+    @ApiModelProperty(value = "车辆未售买断申请sid")
+    private String vehicleActualSid;
+    @ApiModelProperty(value = "付款方式")
+    private String paymentType;
+    @ApiModelProperty(value = "付款方式key")
+    private String paymentTypeKey;
+    @ApiModelProperty(value = "厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty(value = "开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    private BigDecimal payAccount;
+    @ApiModelProperty("付款备注")
+    private String payRemark;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:52
+ * @Description
+ */
+@Data
+public class BaseVehicleActualPayDto implements Dto {
+    private static final long serialVersionUID = -7136887711471736748L;
+
+    @ApiModelProperty(value = "付款方式")
+    @NotBlank(message = "付款方式不能为空")
+    private String paymentType;
+    @ApiModelProperty(value = "付款方式key")
+    @NotBlank(message = "付款方式不能为空")
+    private String paymentTypeKey;
+    @ApiModelProperty(value = "厂家销售通路")
+    @NotBlank(message = "厂家销售通路不能为空")
+    private String actualPay;
+    @ApiModelProperty(value = "开户行")
+    @NotBlank(message = "开户行不能为空")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    @NotBlank(message = "收款银行账号不能为空")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    @NotBlank(message = "付款金额不能为空")
+    private String payAccount;
+    @ApiModelProperty("付款备注")
+    private String payRemark;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeignFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:57
+ * @Description
+ */
+@FeignClient(
+        contextId = "anrui-base-BaseVehicleActualPay",
+        name = "anrui-base",
+        path = "v1/basevehicleactualpay",
+        fallback = BaseVehicleActualPayFeignFallback.class)
+public interface BaseVehicleActualPayFeign {
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:58
+ * @Description
+ */
+@Component
+public class BaseVehicleActualPayFeignFallback {
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 13:36
+ * @Description
+ */
+@Data
+public class BaseVehicleActualPayVo implements Vo {
+    private static final long serialVersionUID = 7103772117018168626L;
+
+    @ApiModelProperty(value = "付款方式")
+    private String paymentType;
+    @ApiModelProperty(value = "付款方式key")
+    private String paymentTypeKey;
+    @ApiModelProperty(value = "厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty(value = "开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    private String payAccount;
+    @ApiModelProperty("付款备注")
+    private String payRemark;
+
+    private String sid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -29,5 +29,13 @@ public class BaseVehicleActualSales extends BaseEntity {
     @ApiModelProperty("未售买断费用")
     private String money;
 
+    @ApiModelProperty("是否需要付款：1是，0否")
+    private String isPay;
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basevehicleactualsales;
 
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,6 +27,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
     private String reason;
     @ApiModelProperty(value = "车辆列表")
     private List<BaseVehicleActualDetailsVo> detailsList = new ArrayList<>();
+    private List<BaseVehicleActualPayVo> detailsPayList = new ArrayList<>();
     @ApiModelProperty(value = "创建人sid")
     private String userSid;
     @ApiModelProperty(value = "任务id")
@@ -35,4 +37,12 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
 
     @ApiModelProperty("未售买断费用")
     private String money;
+
+    @ApiModelProperty("是否需要付款：1是，0否")
+    private String isPay;
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -2,10 +2,12 @@ package com.yxt.anrui.base.api.basevehicleactualsales;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.util.List;
@@ -32,10 +34,21 @@ public class BaseVehicleActualSalesDto implements Dto {
     @ApiModelProperty(value = "买断原因")
     private String reason;
     @ApiModelProperty(value = "车辆列表")
+
     private List<BaseVehicleActualDetailsDto> detailsList;
+    @Valid
+    private List<BaseVehicleActualPayDto> detailsPayList;
 
     @ApiModelProperty("未售买断费用")
     private String money;
+    @ApiModelProperty("付款金额总计")
+    private String payAccountAll;
+    @ApiModelProperty("是否需要付款：1是，0否")
+    private String isPay;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 
 
 }

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

@@ -10,10 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -92,4 +89,8 @@ public interface BusVehicleApplyFeign {
     @ApiOperation(value = "移动端获取排产-上装信息")
     @GetMapping(value = "/getVehicleApplyTopInfo/{sid}")
     ResultBean<AppVehicleApplySzVo> getVehicleApplyTopInfo(@PathVariable("sid") String sid);
+
+    @ApiOperation(value = "采购申请作废")
+    @PutMapping(value = "/abandonApply/{sid}")
+    ResultBean abandonApply(@PathVariable("sid") String sid);
 }

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

@@ -101,4 +101,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
     public ResultBean<AppVehicleApplySzVo> getVehicleApplyTopInfo(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean abandonApply(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@@ -36,6 +36,7 @@ public enum CommonAttachTypeEnum {
      * 26、0009_11：放款文件_首付款证明
      */
     CONTRACT("0001", "合同"),
+    CONTRACT_UPLOAD("0001_1", "合同下载"),
     CREDIT("0002", "人行征信"),
     INVOICE("0003", "开票申请附件"),
     INVOICE_KHKPSQS("0003_1", "客户开票申请书"),

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.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
@@ -31,13 +32,13 @@ public class AppCommonContractInitVo implements Vo {
     private String contractPrice;
 
     @ApiModelProperty("新车买卖合同")
-    private List<String> contractImages;
+    private List<String> contractImages = new ArrayList<>();
 
     @ApiModelProperty("现场签署图片")
-    private List<String> siteSigImages;
+    private List<String> siteSigImages = new ArrayList<>();
 
     @ApiModelProperty("身份证图片")
-    private List<String> idCardImages;
+    private List<String> idCardImages = new ArrayList<>();
 
     @ApiModelProperty("客户类型")
     private String customerKey;
@@ -66,5 +67,10 @@ public class AppCommonContractInitVo implements Vo {
     @ApiModelProperty("身份证图片")
     private String idImagesUrl;
 
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
 
 }

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

@@ -1,10 +1,14 @@
 package com.yxt.anrui.base.api.commoncontract;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppCommonContractPageVo implements Vo {
 
@@ -36,5 +40,15 @@ public class AppCommonContractPageVo implements Vo {
     @ApiModelProperty("节点状态")
     private String nodeState;
 
+    private List<PrintConfirmVo> files = new ArrayList<>();
+    @ApiModelProperty("是否显示下载")
+    private Boolean isShowDownload;
+    @JsonIgnore
+    private String commonContractUrl;
+    @JsonProperty("number")
+    private String num;
+
+
+
 
 }

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

@@ -29,7 +29,7 @@ public class AppCommonContractQuery implements Query {
     @ApiModelProperty("状态")
     private String type;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("客户")
     private String names;
 
     @ApiModelProperty("分公司sid")

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

@@ -29,8 +29,6 @@ import java.util.Date;
 public class CommonContract extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-
-
     @ApiModelProperty("合同编号(合同类型+部门编码+yyyyMMdd+001)")
     private String contractNo;
 
@@ -39,6 +37,11 @@ public class CommonContract extends BaseEntity {
     
 	@ApiModelProperty("合同类型")
     private String contractType;
+
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    @ApiModelProperty("客户类型key")
+    private String customerTypeKey;
     
 	@ApiModelProperty("客户sid")
     private String customerSid;
@@ -109,8 +112,8 @@ public class CommonContract extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
-    @ApiModelProperty("生成的合同的url")
-    private String commonContractUrl;
 
     private String configSid;
+
+    private String commonContractUrl;
 }

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

@@ -87,7 +87,4 @@ public class CommonContractBuscenterVo implements Vo {
 
     @ApiModelProperty("附件文件")
     private List<CommonAppendixVo> pcCommonAppendixDtoList;
-
-    private String commonContractUrl;
-
 }

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

@@ -14,8 +14,8 @@ public class CommonContractEnum {
         /**
          * 新车买卖合同
          */
-        DC_CONTRACT("010", "新车买卖合同（订车）"),
+        DC_CONTRACT("010", "新车买卖合同(订车)"),
-        XC_CONTRACT("009", "新车买卖合同（现车）");
+        XC_CONTRACT("009", "新车买卖合同(现车)");
 
         /**
          * code值

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

@@ -26,4 +26,56 @@ public class DictCommonEnum {
             this.remarks = remarks;
         }
     }
+
+    /**
+     * 客户类型
+     */
+    @Getter
+    public static enum customerType {
+        GR_TYPE("1", "个人"),
+        QY_TYPE("2", "企业"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        customerType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    @Getter
+    public static enum dueBank {
+        HK_TYPE("1", "回款账户"),
+        DJ_TYPE("2", "订金账户"),
+        XL_TYPE("3", "销量保证金"),
+        QY_TYPE("4", "牵引车回款账户"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        dueBank(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 款项名称
+     */
+    @Getter
+    public static enum costType {
+        CG_TYPE("001", "排产"),
+        WC_TYPE("002", "外采"),
+        MD_TYPE("003", "买断"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        costType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -162,5 +162,6 @@
                bankAccount
         FROM base_manufacturer_bank
         WHERE manufacturerSid = #{manufacturerSid}
+        AND isDelete = 0
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
@@ -59,4 +60,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     void deleteByMainSid(String sid);
 
     List<BusApplyVo> selectByApplySid(String modelSid);
+
+    List<BaseManActualVo> actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -55,7 +55,7 @@
         bmb.remarks
         FROM base_manufacturer_bank bmb
         WHERE bmb.manufacturerSid = #{sid}
-        AND bmb.isDelete = 0
+          AND bmb.isDelete = 0
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
@@ -64,6 +64,18 @@
                  left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
                  left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
                  left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
-        where bvm.sid = #{modelSid} and bmb.dueBankKey = '2'
+        where bvm.sid = #{modelSid}
+          and bmb.dueBankKey = '2'
+    </select>
+
+    <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
+        select bmb.accountName,
+               bmb.depositBank,
+               bmb.bankAccount
+        from base_manufacturer_bank bmb
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+        where bmb.isDelete = 0
+          AND bm.useOrg = #{useOrgSid}
+          and bmb.dueBankKey = #{code}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@@ -1,11 +1,9 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
+import com.yxt.anrui.base.api.basemanufacturerbank.*;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,5 +76,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<List<BaseManActualVo>> actualList(String useOrgSid) {
+        ResultBean<List<BaseManActualVo>> rb = ResultBean.fireFail();
+        List<BaseManActualVo> voList = baseManufacturerBankService.actualList(useOrgSid, DictCommonEnum.dueBank.HK_TYPE.getCode());
+        return rb.success().setData(voList);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
@@ -68,4 +69,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public List<BusApplyVo> selectByApplySid(String modelSid) {
         return baseMapper.selectByApplySid(modelSid);
     }
+
+    public List<BaseManActualVo> actualList(String useOrgSid, String code) {
+        return baseMapper.actualList(useOrgSid,code);
+    }
 }

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

@@ -451,4 +451,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}")
     void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid);
+
+    IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList(IPage<BaseSpecialRebateDisGetVehVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -793,8 +793,11 @@
         bv.insideCode,
         (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or
         bvv.vehicleStateValue = '调入')) as vehicleNum,
-        (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
+        (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum,
-
+        bvm.vehicleVersionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        bvm.emissionStandardValue
         FROM base_vehicle bv
         LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
         LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
@@ -1088,4 +1091,26 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="specialRebateDisGetVehPageList"
+            resultType="com.yxt.anrui.base.api.basevehicle.BaseSpecialRebateDisGetVehVo">
+        SELECT
+        bv.`modelSid`,
+        bv.`modelName`,
+        bv.`vinNo`,
+        bv.`costPrice`,
+        bv.`priceDate`,
+        bv.`salesDate`,
+        bv.`solidDate`
+        FROM
+        base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm
+        ON bv.`modelSid` = bvm.`sid`
+        AND bv.`createOrgSid` = bvm.`createOrg`
+        LEFT JOIN base_vehicle_brand bvb
+        ON bvm.`carBrand` = bvb.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -555,6 +555,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseSpecialRebateDisGetVehVo>> specialRebateDisGetVeh(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
+        ResultBean<PagerVo<BaseSpecialRebateDisGetVehVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseSpecialRebateDisGetVehVo> pv = baseVehicleService.specialRebateDisGetVeh(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
         ResultBean<PagerVo<PcBaseVehicleOrderVo>> rb = ResultBean.fireFail();

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

@@ -1434,6 +1434,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(params.getOrderingNo())) {
                 qw.like("bv.orderingNo", params.getOrderingNo());
             }
+            qw.eq("bv.isProblemVeh",0);
 
         }
         return qw;
@@ -2361,6 +2362,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return baseMapper.vehicleRebatePageList(page, qw);
     }
 
+    public PagerVo<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVeh(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
+        IPage<BaseSpecialRebateDisGetVehVo> page = specialRebateDisGetVehPageList(pq);
+        PagerVo<BaseSpecialRebateDisGetVehVo> pv = new PagerVo<>();
+        PagerVo<BaseSpecialRebateDisGetVehVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return pv1;
+    }
+
+    private IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
+        IPage<BaseSpecialRebateDisGetVehVo> page = PagerUtil.queryToPage(pq);
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        BaseSpecialRebateDisGetVehQuery params = pq.getParams();
+        qw.eq("bvb.sid", params.getBrandSid());
+        qw.eq("bv.isDelete", 0);
+        qw.eq("bv.createOrgSid", params.getCreateOrgSid());
+        qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
+        return baseMapper.specialRebateDisGetVehPageList(page, qw);
+    }
+
     private QueryWrapper<BaseVehicle> vehicleRebateWrapper(BaseVehicleRebateQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
@@ -2423,6 +2442,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
     public void updateVinNoByVehSid(String vinNo, String vehicleSid) {
-        baseMapper.updateVinNoByVehSid(vinNo,vehicleSid);
+        baseMapper.updateVinNoByVehSid(vinNo, vehicleSid);
     }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -21,7 +21,12 @@
                inboundPrice,
                insideCode,
                vehicleNum,
-               dayNum
+               dayNum,
+               actualMoney,
+               vehicleVersionValue,
+               fuelTypeValue,
+               gearboxTypeValue,
+               emissionStandardValue
         from base_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java

@@ -5,11 +5,13 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -34,6 +36,9 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService<BaseVehi
             baseVehicleActualDetails = new BaseVehicleActualDetails();
             BeanUtils.copyProperties(dto, baseVehicleActualDetails, "sid");
             baseVehicleActualDetails.setVehicleActualSid(saleSid);
+            if(StringUtils.isNotBlank(dto.getActualMoney())){
+                baseVehicleActualDetails.setActualMoney(new BigDecimal(dto.getActualMoney()));
+            }
             save(baseVehicleActualDetails);
         }
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.biz.basevehicleactualpay;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:55
+ * @Description
+ */
+@Mapper
+public interface BaseVehicleActualPayMapper extends BaseMapper<BaseVehicleActualPay> {
+    List<BaseVehicleActualPay> selectBySaleSid(String sid);
+
+    int deleteBySaleSid(String sid);
+
+    List<BaseVehicleActualPayVo> detailsList(String sid);
+
+    int deleteByActualSid(String s);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml

@@ -0,0 +1,34 @@
+<?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.basevehicleactualpay.BaseVehicleActualPayMapper">
+    <select id="selectBySaleSid" resultType="com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay">
+        select *
+        from base_vehicle_actual_pay
+        where vehicleActualSid = #{sid}
+    </select>
+
+    <delete id="deleteBySaleSid">
+        delete
+        from base_vehicle_actual_pay
+        where vehicleActualSid = #{sid}
+    </delete>
+
+    <select id="detailsList" resultType="com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo">
+        select sid,
+               paymentType,
+               paymentTypeKey,
+               actualPay,
+               bank,
+               receivingAccount,
+               payAccount,
+               payRemark
+        from base_vehicle_actual_pay
+        where vehicleActualSid = #{sid}
+    </select>
+
+    <delete id="deleteByActualSid">
+        delete
+        from base_vehicle_actual_pay
+        where vehicleActualSid = #{s}
+    </delete>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.biz.basevehicleactualpay;
+
+import io.swagger.annotations.Api;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:54
+ * @Description
+ */
+@Api(tags = "车辆未售买断管理")
+@RequestMapping("v1/basevehicleactualsales")
+@Controller
+public class BaseVehicleActualPayRest {
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.base.biz.basevehicleactualpay;
+
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/19 11:55
+ * @Description
+ */
+@Service
+public class BaseVehicleActualPayService extends MybatisBaseService<BaseVehicleActualPayMapper, BaseVehicleActualPay> {
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDetails(List<BaseVehicleActualPayDto> detailsPayList, String sid) {
+        BaseVehicleActualPay baseVehicleActualPay = null;
+        for (BaseVehicleActualPayDto dto : detailsPayList) {
+            baseVehicleActualPay = new BaseVehicleActualPay();
+            BeanUtils.copyProperties(dto, baseVehicleActualPay, "sid");
+            baseVehicleActualPay.setVehicleActualSid(sid);
+            if(StringUtils.isNotBlank(dto.getPayAccount())){
+                baseVehicleActualPay.setPayAccount(new BigDecimal(dto.getPayAccount()));
+            }
+            save(baseVehicleActualPay);
+        }
+    }
+
+    public List<BaseVehicleActualPay> selectBySaleSid(String sid) {
+        return baseMapper.selectBySaleSid(sid);
+    }
+
+    public void deleteBySaleSid(String sid) {
+        baseMapper.deleteBySaleSid(sid);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateListByReturnSid(String sid, List<BaseVehicleActualPayDto> detailsPayList) {
+        saveDetails(detailsPayList, sid);
+    }
+
+    public List<BaseVehicleActualPayVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
+
+    public void deleteByActualSid(String[] sidsList) {
+        List<String> stringList = Arrays.asList(sidsList);
+        for (int i = 0; i < stringList.size(); i++) {
+            baseMapper.deleteByActualSid(stringList.get(i));
+        }
+    }
+}

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

@@ -23,7 +23,10 @@
                taskId,
                procInstId,
                createBySid                            userSid,
-               money
+               money,
+               isPay,
+               useOrgSid,
+               useOrgName
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>

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

@@ -11,6 +11,8 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetai
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.*;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo;
@@ -18,7 +20,12 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQue
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService;
+import com.yxt.anrui.base.biz.basevehicleactualpay.BaseVehicleActualPayService;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -47,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -60,6 +68,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
 
     @Autowired
     private BaseVehicleActualDetailsService baseVehicleActualDetailsService;
+    @Autowired
+    private BaseVehicleActualPayService baseVehicleActualPayService;
 
     @Autowired
     private SysUserFeign sysUserFeign;
@@ -77,6 +87,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
     private MessageFeign messageFeign;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private FinPaymentrecordFeign finPaymentrecordFeign;
 
     /**
      * 分页列表
@@ -148,6 +160,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
                     baseVehicleActualDetailsService.saveDetails(scmVehicleActualSalesDto.getDetailsList(), baseVehicleActualSales.getSid());
                 }
+                if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
+                    if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
+                        baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid);
+
+                    }
+                }
+
             }
         } else {
             //编辑
@@ -165,6 +184,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
                 baseVehicleActualDetailsService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsList());
             }
+
+            //查询pay中是否有关于sales的该条sid数据
+            List<BaseVehicleActualPay> scmVehicleActualPayList = baseVehicleActualPayService.selectBySaleSid(sid);
+            if (scmVehicleActualPayList.size() > 0) {
+                baseVehicleActualPayService.deleteBySaleSid(sid);
+            }
+            if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
+                if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
+                    baseVehicleActualPayService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsPayList());
+                }
+            }
+
         }
         return rb.success().setData(sid);
     }
@@ -200,7 +231,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         }
         vo = baseMapper.details(sid);
         List<BaseVehicleActualDetailsVo> voList = baseVehicleActualDetailsService.detailsList(sid);
+        List<BaseVehicleActualPayVo> voPayList = baseVehicleActualPayService.detailsList(sid);
         vo.setDetailsList(voList);
+        vo.setDetailsPayList(voPayList);
         return rb.success().setData(vo);
     }
 
@@ -245,12 +278,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
     @Transactional(rollbackFor = Exception.class)
     public ResultBean delete(String[] sidsList) {
         ResultBean rb = ResultBean.fireFail();
-        baseVehicleActualDetailsService.deleteByActualSid(sidsList);
         //查询该sid中是否有流程不是待提交的
         int count = baseMapper.selectBySid(StringUtils.join(sidsList, ","));
         if (count > 0) {
             return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
         }
+        baseVehicleActualDetailsService.deleteByActualSid(sidsList);
+        baseVehicleActualPayService.deleteByActualSid(sidsList);
         delBySids(sidsList);
         return rb.success().setMsg("删除成功");
     }
@@ -285,6 +319,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        if ("1".equals(dto.getIsPay())) {
+            if (new BigDecimal(dto.getMoney()).compareTo(new BigDecimal(dto.getPayAccountAll())) != 0) {
+                return rb.setMsg("买断费用合计与付款费用合计不一致，不允许提交");
+            }
+        }
         //保存或修改未售买断申请
         ResultBean<String> resultBean = saveOrUpdateVehicleSales(dto);
         if (!resultBean.getSuccess()) {
@@ -318,7 +357,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             //结算状态设置为预买断
             List<BaseVehicleActualDetailsDto> detailsList = dto.getDetailsList();
             for (BaseVehicleActualDetailsDto f : detailsList) {
-                BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(),useOrgSid);
+                BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(), useOrgSid);
                 baseVehicle.setVinNo(f.getVinNo());
                 baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode());
                 baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks());
@@ -328,12 +367,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             baseVehicleActualSales = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("未售买断申请");
-            messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("供应链");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
@@ -388,10 +427,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseVehicleActualSales.getTaskId())) {
             //判断车辆的结算状态是否包含预买断的状态，如果是的话，返回审核失败
-            Map<String,Object> variables = new HashMap<>();
+            Map<String, Object> variables = new HashMap<>();
-            Map<String,Object> appMap = new HashMap<>();
+            Map<String, Object> appMap = new HashMap<>();
-            appMap.put("sid",bv.getBusinessSid());
+            appMap.put("sid", bv.getBusinessSid());
-            variables.put("app",appMap);
+            variables.put("app", appMap);
             bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -399,21 +438,42 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-            if(!"Event_end".equals(ufVo.getTaskDefKey())){
+            if (!"Event_end".equals(ufVo.getTaskDefKey())) {
                 //极光推送
                 baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
                 ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
                 ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
                 messageFlowableQuery.setModuleName("未售买断申请");
-                messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            } else {
+                if ("1".equals(baseVehicleActualSales.getIsPay())) {
+                    List<BaseVehicleActualPayVo> voPayList = baseVehicleActualPayService.detailsList(baseVehicleActualSales.getSid());
+                    for (BaseVehicleActualPayVo v : voPayList) {
+                        FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                        finPaymentrecordDto.setApplySid(v.getSid());
+                        finPaymentrecordDto.setPayCompanySid(baseVehicleActualSales.getUseOrgSid());
+                        finPaymentrecordDto.setPayType(1);
+                        finPaymentrecordDto.setCreateOrgSid(baseVehicleActualSales.getUseOrgSid());
+                        finPaymentrecordDto.setUseOrgSid(baseVehicleActualSales.getUseOrgSid());
+                        finPaymentrecordDto.setCost(Integer.valueOf(v.getPayAccount()));
+                        finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());
+                        finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());
+                        finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.MD_TYPE.getCode());
+                        finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.MD_TYPE.getRemarks());
+                        finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount());
+                        finPaymentrecordDto.setReceiveCompany(v.getActualPay());
+                        finPaymentrecordFeign.save(finPaymentrecordDto);
+                    }
+
+                }
             }
 
             return rb.success().setData(resultBean.getData());
@@ -491,10 +551,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 }
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
-                Map<String,Object> variables = new HashMap<>();
+                Map<String, Object> variables = new HashMap<>();
-                Map<String,Object> appMap = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
-                appMap.put("sid",query.getBusinessSid());
+                appMap.put("sid", query.getBusinessSid());
-                variables.put("app",appMap);
+                variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
@@ -508,7 +568,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 baseVehicleActualSales = fetchBySid(query.getBusinessSid());
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = baseVehicleActualSales.getProcInstId();
                 ufVo.setProcInsId(procId);
                 ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
@@ -516,13 +576,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
                 messageFlowableQuery.setModuleName("未售买断申请");
-                ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())){
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
-                    messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
-                }else{
+                } else {
-                    messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                    messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
 
                 messageFlowableQuery.setMsgTitle("供应链");
@@ -557,7 +617,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-                if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
+                if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
                     //更新车辆状态为未买断
                     String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
                     String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
@@ -633,7 +693,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 map.put("selectType", 0);
                 appSubVersionVo.setJson(JSONObject.toJSONString(map));
                 BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
-                vos.setCarDetailPage(appVehicleVersionVo);});}
+                vos.setCarDetailPage(appVehicleVersionVo);
+            });
+        }
         vo.setRecords(records);
         return rb.success().setData(vo);
     }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,4 +40,6 @@ public interface BusVehicleApplyMapper extends BaseMapper<BusVehicleApply> {
     BusVehicleApply selectByCode(String code);
 
     AppVehicleApplyVo getVehicleApply(String sid);
+
+    ResultBean abandonApply(String sid);
 }

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

@@ -78,4 +78,10 @@
         from bus_vehicle_apply ba
         where sid = #{sid}
     </select>
+
+    <update id="abandonApply">
+        update bus_vehicle_apply
+        set nodeState = '作废'
+        where sid = #{sid}
+    </update>
 </mapper>

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

@@ -113,5 +113,10 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
         return busVehicleApplyService.getVehicleApplyTopInfo(sid);
     }
 
+    @Override
+    public ResultBean abandonApply(String sid) {
+        return busVehicleApplyService.abandonApply(sid);
+    }
+
 
 }

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

@@ -519,8 +519,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
                     finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
                     finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
-                    finPaymentrecordDto.setCostTypeKey("001");
+                    finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
-                    finPaymentrecordDto.setCostTypeValue("排产");
+                    finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
                     //查询收款单位和收款账号
                     List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
@@ -825,4 +825,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         vo.setPlateThicknessSize("底  " + vo.getPlateThicknessBottom() + "  mm,边  " + vo.getPlateThicknessEdge() + "  mm");
         return rb.success().setData(vo);
     }
+
+    public ResultBean abandonApply(String sid) {
+        return baseMapper.abandonApply(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -63,4 +64,6 @@ public interface CommonAppendixMapper extends BaseMapper<CommonAppendix> {
 
 	@Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
 	CommonAppendixVo fetchByFilePath(String s);
+
+    List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml

@@ -4,25 +4,33 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.commonappendix.CommonAppendixVo">
-        SELECT * FROM common_appendix
+        SELECT *
-        <where>${ew.sqlSegment}</where>
+        FROM common_appendix
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.commonappendix.CommonAppendixVo">
-        SELECT * FROM common_appendix
+        SELECT *
-        <where>${ew.sqlSegment}</where>
+        FROM common_appendix
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
     <select id="selectByLinkSid" resultType="com.yxt.anrui.base.api.commonappendix.CommonAppendixVo">
-        select * from common_appendix where linkSid=#{linkSid}
+        select *
-        <if test="attachType !=null and attachType != ''">
+        from common_appendix where linkSid = #{linkSid}
-            and attachType=#{attachType}
+        <if test="attachType != null and attachType != ''">
+            and attachType = #{attachType}
         </if>
     </select>
     <delete id="deleteByLinkSid">
-        DELETE FROM common_appendix
+        DELETE
-        WHERE linkSid=#{linkSid}
+        FROM common_appendix
-        <if test="attachType != null and attachType !=''">
+        WHERE linkSid = #{linkSid}
-            AND attachType=#{attachType}
+        <if test="attachType != null and attachType != ''">
+            AND attachType = #{attachType}
         </if>
     </delete>
     <select id="getPcAppendix" resultType="com.yxt.anrui.base.api.commonappendix.CommonAppendixVo">
@@ -72,4 +80,11 @@
         GROUP BY attachType
         ORDER BY id
     </select>
+
+    <select id="selectByType" resultType="com.yxt.anrui.base.api.commoncontract.PrintConfirmVo">
+        select fileName as name,concat(#{path},filePath) as downloadUrl
+        from common_appendix
+        where attachType = #{attachType}
+          and linkSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.*;
+import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
 import com.yxt.anrui.crm.api.crmvisit.CrmVisitFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -478,4 +479,8 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
         CommonAppendixVo commonAppendixVo = baseMapper.fetchByFilePath(s);
         return rb.success().setData(commonAppendixVo);
     }
+
+    public List<PrintConfirmVo> selectByType(String sid, String attachType,String path) {
+        return baseMapper.selectByType(sid,attachType,path);
+    }
 }

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

@@ -68,7 +68,7 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
 
     CommonContractBuscenterVo selectByBusSid(String busSid);
 
-    IPage<AppCommonContractPageVo> getContractList(IPage<CommonContract> page, @Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw);
+    IPage<AppCommonContractPageVo> getContractList(IPage<CommonContract> page, @Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw,@Param("names")String names);
 
     /**
      * 移动端-初始化合同审核

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.base.biz.commoncontract.CommonContractMapper">
     <insert id="saveList">
         INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid,
-        createDate, address, deposit, contractAmount, remarks)
+                                    createDate, address, deposit, contractAmount, remarks)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -39,19 +39,19 @@
     </select>
     <select id="listExcel" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractExportVo">
         SELECT cc.`contractNo`,
-        cc.`contractType`,
+               cc.`contractType`,
-        cc.`partyA`,
+               cc.`partyA`,
-        cc.`partyB`,
+               cc.`partyB`,
-        cc.`partyC`,
+               cc.`partyC`,
-        suser.`userName` creatName,
+               suser.`userName` creatName,
-        cc.`createDate`,
+               cc.`createDate`,
-        cc.`address`,
+               cc.`address`,
-        cc.`deposit`,
+               cc.`deposit`,
-        cc.`contractAmount`,
+               cc.`contractAmount`,
-        cc.`remarks`
+               cc.`remarks`
         FROM common_contract cc
-        LEFT JOIN anrui_portal.`sys_user` suser
+                 LEFT JOIN anrui_portal.`sys_user` suser
-        ON cc.createBySid = suser.`sid`
+                           ON cc.createBySid = suser.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -68,36 +68,51 @@
     </select>
 
     <select id="getContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo">
-        SELECT sid AS contractSid,
+        SELECT sid                                         AS contractSid,
-        contractNo AS contractId,
+               contractNo                                  AS contractId,
-        contractType,
+               contractType,
-        partyB,
+               partyB,
-        modelName as model,
+               modelName                                   as model,
-        staffName as handler,
+               staffName                                   as handler,
-        contractAmount AS contractPrice,
+               contractAmount                              AS contractPrice,
-        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
-        if(length(nodeState) > 0, false , true ) as isShowUpdate
+               if(length(nodeState) > 0, false, true)      as isShowUpdate,
+               commonContractUrl,
+               num
         FROM common_contract
         <where>
             ${ew.sqlSegment}
+            <if test="names != null and names != ''">
+                and concat(IFNULL(contractNo
+                  , '')
+                  , ifnull(partyB
+                  , '')) LIKE concat('%'
+                  , #{names}
+                  , '%')
+            </if>
+            order by id
         </where>
     </select>
 
     <!--移动端-初始化合同审核-->
     <select id="getContractInfo" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractInitVo">
-        SELECT sid            AS contractSid,
+        SELECT sid             AS contractSid,
                price,
-               num            AS `number`,
+               num             AS `number`,
-               modelName      AS model,
+               modelName       AS model,
                partyB,
-               contractNo     AS contractId,
+               contractNo      AS contractId,
-               contractAmount AS contractPrice,
+               contractAmount  AS contractPrice,
                customerSid,
                appdixUrl,
                sceneSignUrl,
-                taskId,
+               idImagesUrl,
-                procInstId as procInsId,
+               taskId,
-        staffSid as userSid
+               procInstId      as procInsId,
+               staffSid        as userSid,
+               customerTypeKey as customerKey,
+               modelSid,
+               configSid
         FROM common_contract
         WHERE sid = #{contractSid}
     </select>
@@ -120,7 +135,7 @@
     <update id="updateFlowFiled">
         UPDATE common_contract
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+          , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>

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

@@ -6,6 +6,7 @@ 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.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
@@ -986,33 +987,32 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         AppCommonContractQuery query = pagerQuery.getParams();
         QueryWrapper<CommonContract> qw = appCreateQueryWrapper(query);
         IPage<CommonContract> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw);
+        IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw, query.getNames());
+        List<AppCommonContractPageVo> records = iPage.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            for (AppCommonContractPageVo vo : records) {
+                String sid = vo.getContractSid();
+                //根据sid查询合同
+                List<PrintConfirmVo> list = commonAppendixService.selectByType(sid, CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType(), docPdfComponent.getPrefixTemplateUrl());
+                vo.setFiles(list);
+                if (StringUtils.isNotBlank(vo.getCommonContractUrl())) {
+                    vo.setIsShowDownload(true);
+                } else {
+                    vo.setIsShowDownload(false);
+                }
+            }
+        }
         PagerVo<AppCommonContractPageVo> p = PagerUtil.pageToVo(iPage, null);
         return p;
     }
 
     private QueryWrapper<CommonContract> appCreateQueryWrapper(AppCommonContractQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<CommonContract> qw = new QueryWrapper<>();
-
-
-//        if (StringUtils.isNotBlank(query.getType())) { //合同类型
-//            qw.eq("contractTypeKey", query.getType());
-//        }
-        if (StringUtils.isNotBlank(query.getNames())) { // 甲方名称
-            qw.like("partyA", query.getNames());
-        }
-        if (StringUtils.isNotBlank(query.getNames())) { // 乙方名称
-            qw.like("partyB", query.getNames());
-        }
-        if (StringUtils.isNotBlank(query.getNames())) { // 其他方名称
-            qw.like("partyC", query.getNames());
-        }
         if (StringUtils.isNotBlank(query.getUserSid())) { // 业务员sid
             qw.eq("staffSid", query.getUserSid());
         }
-        if (StringUtils.isNotBlank(query.getType())) { // 业务员sid
+        if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("state", query.getType());
         }
         return qw;
@@ -1049,24 +1049,28 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             vo.setSiteSigImages(siteSig);
         }
         if (StringUtils.isNotBlank(vo.getCustomerKey())) {
-            if (vo.getCustomerKey().equals("1")) {
+            if ("1".equals(vo.getCustomerKey())) {
-                vo.setIdCardArchives(false);
+                //查询客户的档案库中是否有图片
-                if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
+                ResultBean<List<String>> resultBean = crmCustomerTempFeign.selectCustomerFile(vo.getCustomerSid());
-
+                List<String> stringList = resultBean.getData();
-                    String[] split3 = vo.getSceneSignUrl().split(",");
+                if (stringList.size() > 0) {
-                    List<String> idCard = new ArrayList<>();
+                    vo.setIdCardArchives(true);
-                    List<String> idCardImages = Arrays.asList(split3);
+                    vo.setIdCardImages(stringList);
-                    for (String idCardImage : idCardImages) {
-                        String idCardImagesUrl = urlPrefix + idCardImage;
-                        idCard.add(idCardImagesUrl);
-                    }
-                    vo.setIdCardImages(idCard);
                 } else {
-                    vo.setIdCardImages(new ArrayList<>());
+                    vo.setIdCardArchives(false);
+                    if (StringUtils.isNotBlank(vo.getIdImagesUrl())) {
+                        String[] split3 = vo.getSceneSignUrl().split(",");
+                        List<String> idCard = new ArrayList<>();
+                        List<String> idCardImages = Arrays.asList(split3);
+                        for (String idCardImage : idCardImages) {
+                            String idCardImagesUrl = urlPrefix + idCardImage;
+                            idCard.add(idCardImagesUrl);
+                        }
+                        vo.setIdCardImages(idCard);
+                    } else {
+                        vo.setIdCardImages(new ArrayList<>());
+                    }
                 }
-            } else if (vo.getCustomerKey().equals("2")) {
-                vo.setIdCardArchives(true);
-//                往里添加客户档案里的身份证信息
             }
         }
         return vo;
@@ -1106,7 +1110,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
 
-        if (dto.getContractImages() != null) {
+        if (dto.getSiteSigImages() != null) {
             for (String siteSigImages : dto.getSiteSigImages()) {
                 if (siteSigImages.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1116,7 +1120,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
 
-        if (dto.getContractImages() != null) {
+        if (dto.getIdCardImages() != null) {
             for (String idCardImage : dto.getIdCardImages()) {
                 if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1125,7 +1129,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1));
             }
         }
-        updateById(commonContract);
+        baseMapper.updateById(commonContract);
         return rb.success().setData(commonContract.getSid());
     }
 
@@ -1407,7 +1411,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //订金
                     commonContract.setDeposit(new BigDecimal(depositTotal));
                     //合同金额
-                    commonContract.setContractAmount(depositTotal);
+                    commonContract.setContractAmount(appOrderDetailsVo.getPriceInfo().getTotalPrice());
                     //合同附件
                     //身份证信息附件
                     //车型sid
@@ -1422,7 +1426,35 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //单台订金
                     commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
                     commonContract.setCommonContractUrl(finalUrl);
+                    commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
+                    commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
                     save(commonContract);
+                    if (list.size() > 0) {
+                        //添加合同下载路径
+                        for (PrintConfirmVo vo : list) {
+                            String str = vo.getDownloadUrl();
+                            String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
+                            String uploadPath = docPdfComponent.getUploadTemplateUrl();
+                            CommonAppendix commonAppendix = new CommonAppendix();
+                            commonAppendix.setLinkSid(commonContract.getSid());
+                            commonAppendix.setAttachType(CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType());
+                            String pathLoc = str.replace(urlPrefix, uploadPath);
+                            pathLoc = pathLoc.replace("/", File.separator);
+                            File file = new File(pathLoc);
+                            String size = "";
+                            if (file != null) {
+                                size = FileUploadComponent.getPrintSize(file.length());
+                            }
+                            String suffix = str.substring(str.lastIndexOf(".") + 1); // 文件类型
+                            String fileName = str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")); // 文件名
+                            commonAppendix.setFileName(vo.getName());
+                            commonAppendix.setFileType(suffix);
+                            commonAppendix.setFileSize(size);
+                            commonAppendix.setFilePath(str.replace(urlPrefix, ""));
+                            commonAppendix.setRemarks("合同下载");
+                            commonAppendixService.insert(commonAppendix);
+                        }
+                    }
                     return commonContract.getSid();
                 });
             }

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

@@ -30,6 +30,8 @@ public class AppOrderDetailsVo implements Vo {
     private String phone;
     @ApiModelProperty(value = "客户类型")
     private String customerKey;
+    @ApiModelProperty("客户类型")
+    private String customerType;
     @ApiModelProperty(value = "订单类型")
     private String orderType;
     @ApiModelProperty(value = "挂靠公司")

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

@@ -93,11 +93,11 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo">
         SELECT customerSid,
                customerName,
-               mobile            AS customerMobile,
+               mobile               AS customerMobile,
-               payTypeKey        AS payType,
+               payTypeKey           AS payType,
-               payType           AS payValue,
+               payType              AS payValue,
-               billingTypeKey    AS invoiceType,
+               billingTypeKey       AS invoiceType,
-               billingType       AS invoiceValue,
+               billingType          AS invoiceValue,
                affiliatedCompany,
                affiliatedCompanySid as affiliatedOrgSid,
                financePlan,
@@ -175,6 +175,7 @@
                bo.customerName                        as name,
                bo.mobile                              as phone,
                bo.customerClassKey                    as customerKey,
+               bo.customerClass                       as customerType,
                bo.affiliatedCompany                   as affiliated,
                bo.billingType                         as invoiceType,
                bo.orgName                             as departmentName,
@@ -209,7 +210,7 @@
     </update>
 
     <select id="selectNum" resultType="int">
-        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED),0) as code
+        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
         from bus_sales_order
         where billNo LIKE concat(#{bill}, '%')
     </select>

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -147,5 +147,8 @@ public interface CrmCustomerTempFeign {
     @PutMapping("/saveCustomerArchives")
     public ResultBean saveCustomerArchives(@Valid @RequestBody AppCrmCustomerTempArchivesDto dto);
 
+    @ResponseBody
+    @GetMapping("/selectCustomerFile/{customerSid}")
+    public ResultBean<List<String>> selectCustomerFile(@PathVariable("customerSid")String customerSid);
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -115,5 +115,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -26,7 +26,6 @@
                ccf.dataType AS `key`,
                ccf.fileName AS title,
                createTime
---                (SELECT MAX(cf.createTime) FROM crm_file cf WHERE cf.linkSid = ccf.sid) AS createTime
         FROM crm_customer_file ccf
         WHERE ccf.linkSid = #{customerSid}
     </select>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@@ -32,8 +32,6 @@ import com.yxt.anrui.base.api.basedatalist.BaseDataListFeign;
 import com.yxt.anrui.base.api.basedatalist.BaseDataListVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmcustomerfile.*;
-import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
-import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataDto;
 import com.yxt.anrui.crm.api.crmfile.CrmFile;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDto;
@@ -41,19 +39,16 @@ import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.base.utils.DateUtils;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -311,4 +306,22 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
         String dataType = "身份证";
         return baseMapper.selectIdImageByCustomerSid(customerSid, dataType);
     }
+
+    public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
+        List<String> list = new ArrayList<>();
+        if (dataVos.size() > 0) {
+            for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
+                String sid = appCustomerArchivesDataVo.getSid();
+                List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid);
+                for (CrmFile crmFile : listVo) {
+                    String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
+                    list.add(url);
+                }
+                appCustomerArchivesDataVo.setFiles(list);
+            }
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -263,5 +263,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerFileService.saveCustomerArchives(dto);
     }
 
+    @Override
+    public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+        return crmCustomerFileService.selectCustomerFile(customerSid);
+    }
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -68,4 +68,9 @@ public interface FinPaymentrecordFeign {
     @PostMapping("/update")
     @ResponseBody
     ResultBean update(@RequestBody FinPaymentrecordUpdateDto dto);
+
+    @ApiOperation("作废")
+    @PutMapping("/updateState/{sid}")
+    @ResponseBody
+    ResultBean updateState(@PathVariable("sid")String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -64,4 +64,9 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean updateState(String sid) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java

@@ -26,14 +26,14 @@
 package com.yxt.anrui.fin.biz.finpaymentrecord;
 
 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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
-import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo;
 
 import java.util.List;
 
@@ -66,4 +66,6 @@ public interface FinPaymentrecordMapper extends BaseMapper<FinPaymentrecord> {
     List<String> selectApplySids(@Param("list") List<String> sids);
 
     int updateStateBySid(@Param("sid") String sid, @Param("state") int i);
+
+    List<String> selectApplySidBySid(List<String> sids);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -48,4 +48,12 @@
         set state = #{state}
         where sid = #{sid}
     </update>
+
+    <select id="selectApplySidBySid" resultType="java.lang.String">
+        select state
+        from fin_paymentrecord WHERE sid IN
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -71,4 +71,9 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return finPaymentrecordService.updateAll(dto);
     }
+
+    @Override
+    public ResultBean updateState(String sid) {
+        return finPaymentrecordService.updateState(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -136,6 +136,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         if (applySids.contains("")) {
             return rb.setMsg("处理的数据包含收款账号不存在的数据");
         }
+        //判断是否包含已作废的
+        List<String> sidState = baseMapper.selectApplySidBySid(sids);
+        if (sidState.size() > 1) {
+            if (sidState.contains(3)) {
+                return rb.setMsg("处理的数据包含已作废的记录");
+            }
+        }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
@@ -155,15 +162,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             }
 
             //推送金蝶付款单
-            try{
+            try {
-                ApPayBill apb=createApPayBill(finPaymentrecord);
+                ApPayBill apb = createApPayBill(finPaymentrecord);
                 ResultBean resultBean1 = apPayBillService.draftApPayBill(apb);
-            }catch (Exception e){
+            } catch (Exception e) {
                 log.error(e.getMessage());
             }
 
 
-
         }
         return rb.success();
     }
@@ -213,17 +219,17 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             //支付类型
             fpaybillentry.setFPayType("A");
             //付款用途
-            if(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())){
+            if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
                 //订金
                 fpaybillentry.setFPURPOSEID("SFKYT09_SYS");
-            }else{
+            } else {
                 //车款
                 fpaybillentry.setFPURPOSEID("SFKYT08_SYS");
             }
             //结算方式
-            if("承兑".equals(finPaymentrecord.getPayWayValue())){
+            if ("承兑".equals(finPaymentrecord.getPayWayValue())) {
                 fpaybillentry.setFSETTLETYPEID("09");
-            }else{
+            } else {
                 fpaybillentry.setFSETTLETYPEID("02");
             }
             FPAYBILLENTRYs.add(fpaybillentry);
@@ -236,4 +242,21 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         }
 
     }
+
+    /**
+     * 作废
+     *
+     * @param sid
+     * @return
+     */
+    public ResultBean updateState(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询是否是未打款的
+        FinPaymentrecord finPaymentrecord = fetchBySid(sid);
+        if (finPaymentrecord.getState() == 2) {
+            return rb.setMsg("该记录已打款，不能作废");
+        }
+        int i = baseMapper.updateStateBySid(sid, 3);
+        return rb.success();
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDisGetVehQuery.java

@@ -0,0 +1,44 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebate;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "专项返利分配选择车辆 查询条件", description = "专项返利分配选择车辆 查询条件")
+public class ScmSpecialRebateDisGetVehQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDisGetVehVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmspecialrebate;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象")
+public class ScmSpecialRebateDisGetVehVo implements Query {
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+    @ApiModelProperty("入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date priceDate;
+    @ApiModelProperty("销售日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date salesDate;
+    @ApiModelProperty(value = "买断日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date solidDate;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java

@@ -93,6 +93,4 @@ public interface ScmSpecialRebateFeign {
     @PostMapping("/checkApplyGetAlreadyUploadSpecialRebate")
     @ResponseBody
     public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetAlreadyUploadSpecialRebate(@RequestBody PagerQuery<ScmSpecialRebateQuery> pq);
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@@ -56,7 +56,8 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
 
     private String sid; // sid
 
-
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("品牌名称")
@@ -65,6 +66,8 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
     private String checkApply; // 核对申请标题
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java

@@ -26,10 +26,10 @@
 package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java

@@ -28,8 +28,6 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -106,12 +104,12 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate
 	}
 
 	@Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+	public ResultBean<List<com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo>> getNextNodesForSubmit(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+	public ResultBean<List<com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo>> getPreviousNodesForReject(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthQuery <br/>
+ * Description: 月度盘库 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 查询条件", description = "月度盘库 查询条件")
+public class AppScmVehInventorymonthQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("报告编号/创建人")
+    private String names;
+    @ApiModelProperty("创建日期")
+    private String date;
+    @ApiModelProperty("盘库报告sid")
+    private String reportSid;
+    @ApiModelProperty("盘库结果")
+    private String state;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthVo <br/>
+ * Description: 月度盘库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 视图数据对象", description = "月度盘库 视图数据对象")
+public class AppScmVehInventorymonthVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("剩余盘库记录数量")
+    private String surplusNumber;
+    @ApiModelProperty("盘库记录总数数量")
+    private String totalNumber;
+    @ApiModelProperty("盘亏数量")
+    private String lossNumber;
+    @ApiModelProperty("盘损数量")
+    private String damageNumber;
+    @ApiModelProperty("盘盈数量")
+    private String profitNumber;
+    @ApiModelProperty("实盘数量")
+    private String actualNumber;
+    @ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示")
+    private Boolean showBtn;
+
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -50,8 +52,8 @@ import java.util.List;
  */
 @Api(tags = "月度盘库")
 @FeignClient(
-        contextId = "aaa-ScmVehInventorymonth",
+        contextId = "anrui-scm-ScmVehInventorymonth",
-        name = "aaa",
+        name = "anrui-scm",
         path = "v1/scmvehinventorymonth",
         fallback = ScmVehInventorymonthFeignFallback.class)
 public interface ScmVehInventorymonthFeign {
@@ -81,5 +83,11 @@ public interface ScmVehInventorymonthFeign {
     @ResponseBody
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-获取盘库报告列表")
+    @PostMapping("/getCarInventoryReportList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(@RequestBody PagerQuery<AppScmVehInventorymonthQuery> pagerQuery);
+
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java

@@ -74,4 +74,9 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
 	public ResultBean getInventoryRecords(String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(PagerQuery<AppScmVehInventorymonthQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "盘库报告")
 @FeignClient(
-        contextId = "aaa-ScmVehInventoryreport",
+        contextId = "anrui-scm-ScmVehInventoryreport",
-        name = "aaa",
+        name = "anrui-scm",
         path = "v1/scmvehinventoryreport",
         fallback = ScmVehInventoryreportFeignFallback.class)
 public interface ScmVehInventoryreportFeign {
@@ -65,12 +65,12 @@ public interface ScmVehInventoryreportFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehInventoryreportDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound;
 import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -43,4 +44,7 @@ public interface ScmApplyInboundMapper extends BaseMapper<ScmApplyInbound> {
 	int updateFlowFiled(Map<String, Object> map);
 
     int selectNum(@Param("bill")String bill);
+
+	@Update("update scm_apply_inbound set num = #{num} where sid = #{busSid}")
+    void updateNumBySid(@Param("num") String num,@Param("busSid") String busSid);
 }

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

@@ -356,6 +356,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         //用户的组织全路径
         String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         String busSid = dto.getSid();
+        String num = dto.getNum();
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
         if (StringUtils.isBlank(busSid)) {
             Map<String, Object> variables = BeanUtil.beanToMap(dto);
@@ -377,6 +378,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
                 saveOrUpdateApplyInBound(scmApplyInboundDto);
             }
+            int i = Integer.parseInt(num) - scmApplyInboundVehicleDtos1.size();
+            baseMapper.updateNumBySid(String.valueOf(i),busSid);
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(dto, bv);
             bv.setOrgSidPath(orgSidPath);
@@ -395,7 +398,6 @@ 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();
@@ -404,7 +406,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             String vinNo = scmApplyInboundVehicleDto.getVinNo();
             if (StringUtils.isBlank(vinNo)){
                 scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
-                BeanUtil.copyProperties(scmApplyInbound,scmApplyInboundDto);
+                BeanUtil.copyProperties(dto,scmApplyInboundDto);
                 scmApplyInboundDto.setSid(null);
                 scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
             }else {
@@ -416,6 +418,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
             saveOrUpdateApplyInBound(scmApplyInboundDto);
         }
+        baseMapper.updateNumBySid(String.valueOf(scmApplyInboundVehicleDtos2.size()),businessSid);
         ScmApplyInbound entity = this.fetchBySid(dto.getSid());
         String businessTaskid = entity.getTaskId();
         BusinessVariables bv = new BusinessVariables();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -64,4 +65,6 @@ public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper<ScmSpecialr
 	List<ScmSpecialrebateCheckapplyVo> selectListVo();
 
     int selectBySid(String join);
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@@ -32,4 +32,19 @@
 		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
+
+	<update id="updateFlowFiled">
+		UPDATE scm_specialrebate_checkapply
+		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -25,11 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -39,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo;
@@ -99,41 +101,44 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
 
 	@Override
 	public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
-		return null;
+		return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto);
 	}
 
 	@Override
 	public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) {
-		return null;
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(dto, bv);
+		bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
+		return scmSpecialrebateCheckapplyService.complete(bv);
 	}
 
 	@Override
 	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
-		return null;
+		return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo);
 	}
 
 	@Override
 	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
-		return null;
+		return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo);
 	}
 
 	@Override
 	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
-		return null;
+		return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo);
 	}
 
 	@Override
 	public ResultBean flowRecord(String procInsId) {
-		return null;
+		return scmSpecialrebateCheckapplyService.flowRecord(procInsId);
 	}
 
 	@Override
 	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
-		return null;
+		return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query);
 	}
 
 	@Override
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
-		return null;
+		return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query);
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -27,8 +27,22 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
@@ -44,14 +58,12 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
+import java.util.stream.Collectors;
-import java.util.List;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -71,6 +83,14 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
 
     @Autowired
     private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
 
     private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -173,6 +193,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         ResultBean rb = ResultBean.fireFail();
         ScmSpecialrebateCheckapply entity = new ScmSpecialrebateCheckapply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
         baseMapper.insert(entity);
         return rb.success().setData(entity.getSid());
     }
@@ -242,4 +263,221 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         }
         return rb.success().setMsg("删除成功");
     }
+
+    public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, scmSpecialrebateCheckapply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //=====================添加app所需参数
+        Map<String,Object> appMap = new HashMap<>();
+        appMap.put("sid",businessSid);
+        variables.put("app",appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(scmSpecialrebateCheckapply.getTaskId());
+            bv.setTaskDefKey(scmSpecialrebateCheckapply.getNodeSid());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitScmSpecialRebateCheckApplyDto dto, ScmSpecialrebateCheckapply scmSpecialRebateCheckApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (scmSpecialRebateCheckApply != null) {
+                String businessTaskId = scmSpecialRebateCheckApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(scmSpecialrebateCheckapply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean revokeProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询排内购申请
+        ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmSpecialrebateCheckapply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                flowTaskVo.setValues(BeanUtil.beanToMap(scmSpecialrebateCheckapply));
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean taskReject(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid());
+        if (scmSpecialrebateCheckapply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = scmSpecialrebateCheckapply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmSpecialrebateCheckapply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean flowRecord(String procInsId) {
+        return flowTaskFeign.businessFlowRecord(procInsId);
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
 }

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

@@ -413,7 +413,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
                 BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid");
                 vinNo = scmVehicleGressionVehDto.getVehVin();
-                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
+                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo,useOrgSid).getData();
                 scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid());
                 scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid());
                 scmVehicleGressionVehService.save(scmVehicleGressionVeh);
@@ -432,7 +432,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
                 BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid");
                 vinNo = scmVehicleGressionVehDto.getVehVin();
-                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
+//                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
+                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo,useOrgSid).getData();
                 scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid());
                 scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid());
                 scmVehicleGressionVehService.save(scmVehicleGressionVeh);
@@ -716,13 +717,15 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        scmVehicleGression = fetchBySid(businessSid);
         String state = "2";
         baseMapper.updateStateBySid(businessSid, state);
         //推送车辆移库状态
         List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(businessSid);
         if (vinList.size() > 0) {
             for (String s : vinList) {
-                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
+                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(s,scmVehicleGression.getUseOrgSid()).getData();
+//                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
                 BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
                 baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
                 baseVehicleTempstateDto.setTempStateKey("001");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -125,4 +125,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     String getVin(@Param("vin") String vin);
 
     List<ScmVehicleStayInventoryVo> selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
+
+    @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' ")
+    int getInventoryState(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -167,12 +167,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
         AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleCarInventoryListPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getName());
-        List<AppScmVehicleCarInventoryListPageVo> records = iPage.getRecords();
+//        List<AppScmVehicleCarInventoryListPageVo> records = iPage.getRecords();
-        for (AppScmVehicleCarInventoryListPageVo record : records) {
+//        for (AppScmVehicleCarInventoryListPageVo record : records) {
-            if ("2".equals(record.getState())) {
+//            if ("2".equals(record.getState())) {
-                record.setShowUpdataBtn(true);
+//                record.setShowUpdataBtn(true);
-            }
+//            }
-        }
+//        }
         return iPage;
     }
 
@@ -202,7 +202,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     }
 
 
-
     /**
      * 手机端-获取盘库记录列表 查询条件
      *
@@ -217,6 +216,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("svi.locationSid", query.getWarehouseSid());
         }
+        qw.notIn("InventoryState", "无");
         String inventStartDate = query.getInventStartDate();
         String inventEndDate = query.getInventEndDate();
         qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (InventoryDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
@@ -457,4 +457,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         int count = baseMapper.getToDoNum(useOrgSid);
         return rb.success().setData(String.valueOf(count));
     }
+
+    public boolean getInventoryState(String userSid) {
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getInventoryState(useOrgSid);
+        if (count == 0) {
+            return true;
+        }
+        return false;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehinventorymonth;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonth;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthMapper.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthMapper <br/>
+ * Description: 月度盘库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehInventorymonthMapper extends BaseMapper<ScmVehInventorymonth> {
+
+	//@Update("update scm_veh_inventorymonth set name=#{msg} where id=#{id}")
+	//IPage<ScmVehInventorymonthVo> voPage(IPage<ScmVehInventorymonth> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventorymonth> qw);
+	
+	IPage<ScmVehInventorymonthVo> selectPageVo(IPage<ScmVehInventorymonth> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventorymonth> qw);
+	
+	List<ScmVehInventorymonthVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventorymonth> qw);
+	
+	@Select("select * from scm_veh_inventorymonth")
+	List<ScmVehInventorymonthVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo">
+		SELECT * FROM scm_veh_inventorymonth <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo">
+		SELECT * FROM scm_veh_inventorymonth <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java

@@ -0,0 +1,106 @@
+package com.yxt.anrui.scm.biz.scmvehinventorymonth; /*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+
+
+import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
+import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthRest <br/>
+ * Description: 月度盘库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "月度盘库")
+@RestController("com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthRest")
+@RequestMapping("v1/scmvehinventorymonth")
+public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
+
+    @Autowired
+    private ScmVehInventorymonthService scmVehInventorymonthService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmVehInventorymonthVo>> listPage(@RequestBody PagerQuery<ScmVehInventorymonthQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehInventorymonthVo> pv = scmVehInventorymonthService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ScmVehInventorymonthDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehInventorymonthService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehInventorymonthService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehInventorymonthDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehInventorymonthDetailsVo vo = scmVehInventorymonthService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean getInventoryRecords(String userSid) {
+        return scmVehInventorymonthService.getInventoryRecords(userSid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(PagerQuery<AppScmVehInventorymonthQuery> pagerQuery) {
+        return null;
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -0,0 +1,170 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehinventorymonth;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
+import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonth;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthQuery;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthDetailsVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthDto;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthService.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthService <br/>
+ * Description: 月度盘库 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInventorymonthMapper, ScmVehInventorymonth> {
+
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    SysUserFeign sysUserFeign;
+    @Autowired
+    ScmVehicleInventoryService scmVehicleInventoryService;
+
+
+    private QueryWrapper<ScmVehInventorymonth> createQueryWrapper(ScmVehInventorymonthQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehInventorymonth> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehInventorymonthVo> listPageVo(PagerQuery<ScmVehInventorymonthQuery> pq) {
+        ScmVehInventorymonthQuery query = pq.getParams();
+        QueryWrapper<ScmVehInventorymonth> qw = createQueryWrapper(query);
+        IPage<ScmVehInventorymonth> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehInventorymonthVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehInventorymonthVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmVehInventorymonthDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmVehInventorymonthDto dto) {
+        ScmVehInventorymonth entity = new ScmVehInventorymonth();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmVehInventorymonthDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmVehInventorymonth entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehInventorymonthDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehInventorymonth entity = fetchBySid(sid);
+        ScmVehInventorymonthDetailsVo vo = new ScmVehInventorymonthDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean getInventoryRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        boolean inventoryState = scmVehicleInventoryService.getInventoryState(userSid);
+        if (inventoryState) {
+            return rb.setMsg("盘库记录生成失败，记录存在未确认数据");
+        }
+        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+        ScmVehInventorymonth scmVehInventorymonth = new ScmVehInventorymonth();
+        scmVehInventorymonth.setBillNo("");
+        scmVehInventorymonth.setCreateOrgSid(useOrgSid);
+        scmVehInventorymonth.setCreateOrgName(sysStaffOrg.getOrgName());
+        scmVehInventorymonth.setUseOrgSid(useOrgSid);
+        scmVehInventorymonth.setUseOrgName(sysStaffOrg.getOrgName());
+        save(scmVehInventorymonth);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
+                ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
+                scmVehicleInventory.setVinNo(appScmInventoryRecordsVo.getVin());
+                scmVehicleInventory.setMainSid(scmVehInventorymonth.getSid());
+                scmVehicleInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
+                scmVehicleInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
+                scmVehicleInventory.setInventoryState("无");
+                scmVehicleInventory.setInventoryStateKey("");
+                scmVehicleInventory.setCreateOrgSid(useOrgSid);
+                scmVehicleInventory.setUseOrgSid(useOrgSid);
+                scmVehicleInventoryService.save(scmVehicleInventory);
+            }
+        } else {
+            return rb.setMsg("暂无需要盘库记录");
+        }
+        return rb.success();
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehinventoryreport;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreport;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportMapper.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportMapper <br/>
+ * Description: 盘库报告. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehInventoryreportMapper extends BaseMapper<ScmVehInventoryreport> {
+
+	//@Update("update scm_veh_inventoryreport set name=#{msg} where id=#{id}")
+	//IPage<ScmVehInventoryreportVo> voPage(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventoryreport> qw);
+	
+	IPage<ScmVehInventoryreportVo> selectPageVo(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
+	
+	List<ScmVehInventoryreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
+	
+	@Select("select * from scm_veh_inventoryreport")
+	List<ScmVehInventoryreportVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehinventoryreport.ScmVehInventoryreportMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo">
+		SELECT * FROM scm_veh_inventoryreport <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo">
+		SELECT * FROM scm_veh_inventoryreport <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehinventoryreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreport;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportQuery;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDetailsVo;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportRest <br/>
+ * Description: 盘库报告. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "盘库报告")
+@RestController("com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportRest")
+@RequestMapping("v1/scmvehinventoryreport")
+public class ScmVehInventoryreportRest implements ScmVehInventoryreportFeign {
+
+	@Autowired
+	private ScmVehInventoryreportService scmVehInventoryreportService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehInventoryreportVo>> listPage(@RequestBody PagerQuery<ScmVehInventoryreportQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehInventoryreportVo> pv = scmVehInventoryreportService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehInventoryreportDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehInventoryreportService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehInventoryreportService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehInventoryreportDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehInventoryreportDetailsVo vo = scmVehInventoryreportService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehinventoryreport;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreport;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportQuery;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDetailsVo;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportService.java <br/>
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportService <br/>
+ * Description: 盘库报告 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInventoryreportMapper, ScmVehInventoryreport> {
+	private QueryWrapper<ScmVehInventoryreport> createQueryWrapper(ScmVehInventoryreportQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmVehInventoryreport> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmVehInventoryreportVo> listPageVo(PagerQuery<ScmVehInventoryreportQuery> pq) {
+		ScmVehInventoryreportQuery query = pq.getParams();
+		QueryWrapper<ScmVehInventoryreport> qw = createQueryWrapper(query);
+		IPage<ScmVehInventoryreport> page = PagerUtil.queryToPage(pq);
+		IPage<ScmVehInventoryreportVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmVehInventoryreportVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmVehInventoryreportDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmVehInventoryreportDto dto){
+		ScmVehInventoryreport entity = new ScmVehInventoryreport();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmVehInventoryreportDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmVehInventoryreport entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmVehInventoryreportDetailsVo fetchDetailsVoBySid(String sid){
+		ScmVehInventoryreport entity = fetchBySid(sid);
+		ScmVehInventoryreportDetailsVo vo = new ScmVehInventoryreportDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java

@@ -57,13 +57,8 @@ public class CommonContractInitVo implements Vo {
 
     @ApiModelProperty("客户sid")
     private String customerSid;
-
+    @ApiModelProperty("配置sid")
-    @ApiModelProperty("合同附件")
+    private String configSid;
-    private String appdixUrl;
+    @ApiModelProperty("车型sid")
-
+    private String modelSid;
-    @ApiModelProperty("现场签署图片附件")
-    private String sceneSignUrl;
-
-    @ApiModelProperty("身份证图片")
-    private String idImagesUrl;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java

@@ -59,7 +59,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
-    @ApiOperation("手机端-获取盘库列表")
+    @ApiOperation("手机端-获取待盘库列表")
     @PostMapping("/getInventoryList")
     @ResponseBody
     public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<InventoryListPageQuery> pagerQuery);
@@ -74,7 +74,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<StayInventoryInfoVo> getInventory(@PathVariable("recordSid") String recordSid);
 
-    @ApiOperation("手机端-初始化盘库记录")
+    @ApiOperation("手机端-初始化盘库记录-弃用")
     @GetMapping("/getInventoryByRecordSid/{recordSid}")
     @ResponseBody
     public ResultBean<StayInventoryInfoVo> getInventoryByRecordSid(@PathVariable("recordSid") String recordSid);
@@ -84,7 +84,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean saveInventory(@RequestBody StayInventoryDto dto);
 
-    @ApiOperation("手机端-保存盘库记录操作")
+    @ApiOperation("手机端-保存盘库记录操作-弃用")
     @PostMapping("/saveInventoryByRecordSid")
     @ResponseBody
     public ResultBean saveInventoryByRecordSid(@RequestBody StayInventoryDto dto);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java

@@ -19,7 +19,7 @@ public class CarInventoryListPageQuery implements Query {
     @ApiModelProperty("存放地点sid")
     private String warehouseSid;
 
-    @ApiModelProperty("盘库状态 通过1 不通过 2")
+    @ApiModelProperty("盘库状态")
     private String state;
 
     @ApiModelProperty("使用组织分公司sid")