Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,7 @@ public class AppBusSaleOrderStateVo implements Vo {
     @ApiModelProperty("上装名称")
     private String topName;
 
-    @ApiModelProperty("挂车状态")
+    @ApiModelProperty("挂车列表是否有数据（1有 0无）")
     private int trailerInfoState;
 
     @ApiModelProperty("价格信息")
@@ -77,6 +77,8 @@ public class AppBusSaleOrderStateVo implements Vo {
     private String vehicleFunctionKey;
     @ApiModelProperty("是否有上装按钮")
     private boolean topState;
+    @ApiModelProperty("是否有挂车按钮")
+    private boolean trailerState;
 
     @ApiModelProperty("上装的采购类型是否允许修改")
     private boolean isMain;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailer.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailer.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer <br/>
+ * Description: 销售订单-挂车信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息", description = "销售订单-挂车信息")
+@TableName("bus_sales_order_trailer")
+public class BusSalesOrderTrailer extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private BigDecimal appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+	@ApiModelProperty("合同附件")
+    private String contractFile; // 合同附件
+	@ApiModelProperty("同车型合格证附件")
+    private String certFile; // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class BusSalesOrderTrailerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private BigDecimal appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<BusSalesOrderTrailerFile> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<BusSalesOrderTrailerFile> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto <br/>
+ * Description: 销售订单-挂车信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 数据传输对象", description = "销售订单-挂车信息 数据传输对象")
+public class BusSalesOrderTrailerDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private BigDecimal appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+	@ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+	@ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign <br/>
+ * Description: 销售订单-挂车信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单-挂车信息")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSalesOrderTrailer",
+        name = "anrui-buscenter",
+        path = "v1/bussalesordertrailer",
+        fallback = BusSalesOrderTrailerFeignFallback.class)
+public interface BusSalesOrderTrailerFeign {
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody List<BusSalesOrderTrailerDto> dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delete")
+    @ResponseBody
+    public ResultBean delete(@RequestParam(value = "sid") String sid);
+      
+    @ApiOperation("根据销售订单sid获取一条记录")
+    @GetMapping("/fetchDetailsByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean<List<BusSalesOrderTrailerDetailsVo>> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeignFallback <br/>
+ * Description: 销售订单-挂车信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFeign {
+
+	@Override
+	public ResultBean save(List<BusSalesOrderTrailerDto> dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delete(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderTrailerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
+		return null;
+	}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFile.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordertrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class BusSalesOrderTrailerFile implements Vo {
+
+    private String url;
+}

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

@@ -126,6 +126,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupServic
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
+import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
@@ -349,6 +350,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private LoanHomevisitPrepFeign loanHomevisitPrepFeign;
     @Autowired
     private BusSolutionsChangeService busSolutionsChangeService;
+    @Autowired
+    private BusSalesOrderTrailerService busSalesOrderTrailerService;
 
     /**
      * 构造查询条件
@@ -1859,6 +1862,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         vo.setVehicleFunctionKey(selectDetails.getData().getVehicleType());
                     }
                 }
+                if (busSalesOrderModelDetailsVo.getModelName().contains("牵引车")){
+                    vo.setTrailerState(true);
+                    int i = busSalesOrderTrailerService.fetchByOrderSid(saleOrderSid);
+                    if (i > 0){
+                        vo.setTrailerInfoState(1);
+                    }else {
+                        vo.setTrailerInfoState(0);
+                    }
+                }else {
+                    vo.setTrailerState(false);
+                    vo.setTrailerInfoState(0);
+                }
             } else {
                 vo.setModleInfoState(0);
                 vo.setModelName("未完善");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -59,6 +59,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -113,6 +114,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BaseVehinstallFeign baseVehinstallFeign;
     @Autowired
     private BusVehicleOrderFeign busVehicleOrderFeign;
+    @Autowired
+    private BusSalesOrderTrailerService busSalesOrderTrailerService;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -222,6 +225,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                 busSalesOrderModel1.setBrandSid(brandSid);
                 busSalesOrderModel1.setModelConfig(modelAlias);
                 save(busSalesOrderModel1);
+                if (!busSalesOrderModel1.getModelName().contains("牵引车")){
+                    busSalesOrderTrailerService.delByOrderSid(salesOrderSid);
+                }
             }
         } else {
             BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordertrailer;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerMapper <br/>
+ * Description: 销售订单-挂车信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusSalesOrderTrailerMapper extends BaseMapper<BusSalesOrderTrailer> {
+
+	@Select("select count(*) from bus_sales_order_trailer where salesOrderSid = #{saleOrderSid}")
+    int fetchByOrderSid(String saleOrderSid);
+
+	@Delete("delete from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid}")
+	void delByOrderSid(String salesOrderSid);
+
+	@Select("select * from bus_sales_order_trailer where salesOrderSid = #{orderSid}")
+	List<BusSalesOrderTrailerDetailsVo> fetchAllByOrderSid(String orderSid);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml

@@ -0,0 +1,6 @@
+<?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.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordertrailer;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerRest <br/>
+ * Description: 销售订单-挂车信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单-挂车信息")
+@RestController("com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerRest")
+@RequestMapping("v1/bussalesordertrailer")
+public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign {
+
+	@Autowired
+	private BusSalesOrderTrailerService busSalesOrderTrailerService;
+
+	@Override
+	public ResultBean save(List<BusSalesOrderTrailerDto> dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delete(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		busSalesOrderTrailerService.deleteBySid(sid);
+		return rb.success();
+	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderTrailerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(orderSid);
+		return rb.success().setData(busSalesOrderTrailerDetailsVos);
+	}
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java

@@ -0,0 +1,134 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordertrailer;
+
+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.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService <br/>
+ * Description: 销售订单-挂车信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusSalesOrderTrailerService extends MybatisBaseService<BusSalesOrderTrailerMapper, BusSalesOrderTrailer> {
+
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	
+	public void saveOrUpdateDto(BusSalesOrderTrailerDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BusSalesOrderTrailerDto dto){
+		BusSalesOrderTrailer entity = new BusSalesOrderTrailer();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BusSalesOrderTrailerDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BusSalesOrderTrailer entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BusSalesOrderTrailerDetailsVo fetchDetailsVoBySid(String sid){
+		BusSalesOrderTrailer entity = fetchBySid(sid);
+		BusSalesOrderTrailerDetailsVo vo = new BusSalesOrderTrailerDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public int fetchByOrderSid(String saleOrderSid) {
+		return baseMapper.fetchByOrderSid(saleOrderSid);
+	}
+
+	public void delByOrderSid(String salesOrderSid) {
+		baseMapper.delByOrderSid(salesOrderSid);
+	}
+
+	public List<BusSalesOrderTrailerDetailsVo> fetchAllByOrderSid(String orderSid) {
+		List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = baseMapper.fetchAllByOrderSid(orderSid);
+		for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
+			BusSalesOrderTrailer busSalesOrderTrailer = fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
+			String certFile = busSalesOrderTrailer.getCertFile();
+			String[] certFiles = certFile.split(",");
+			List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
+			for (String file : certFiles) {
+				String url = fileUploadComponent.getUrlPrefix() + file;
+				BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
+				busSalesOrderTrailerFile.setUrl(url);
+				certFiless.add(busSalesOrderTrailerFile);
+			}
+			String contractFile = busSalesOrderTrailer.getContractFile();
+			String[] contractFiles = contractFile.split(",");
+			List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
+			for (String file : contractFiles) {
+				String url = fileUploadComponent.getUrlPrefix() + file;
+				BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
+				busSalesOrderTrailerFile.setUrl(url);
+				contractFiless.add(busSalesOrderTrailerFile);
+			}
+			busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
+			busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
+		}
+		return busSalesOrderTrailerDetailsVos;
+	}
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -42,6 +42,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.anrui.terminal.api.autoservice.solutionsChange.flow.AppSolutionsChangeDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
@@ -172,6 +175,23 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean deleteDiscount(@RequestParam(value = "saleOrderSid") String orderSid, @RequestParam(value = "sid") String sid);
 
+    /*-----------------------------------------挂车信息------------------------------------------*/
+
+    @ApiOperation("查看挂车信息")
+    @GetMapping("/getAppTrailerListVoByOrderSid/{orderSid}")
+    @ResponseBody
+    ResultBean<TrailerVo> getAppTrailerListVoByOrderSid(@PathVariable(value = "orderSid") String orderSid);
+
+    @ApiOperation("保存挂车信息")
+    @PostMapping("/saveOrUpdateAppOrderTrailer")
+    @ResponseBody
+    ResultBean saveOrUpdateAppOrderTrailer(@RequestBody List<AppSalesOrderTrailerDto> dto);
+
+    @ApiOperation("删除挂车信息")
+    @DeleteMapping("/delAppOrderTrailerBySid")
+    @ResponseBody
+    ResultBean delAppOrderTrailerBySid(@RequestParam(value = "sid") String sid);
+
     /*-----------------------------------------价格信息------------------------------------------*/
 
     @ApiOperation("初始化销售订单价格信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -42,6 +42,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -151,6 +154,21 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<TrailerVo> getAppTrailerListVoByOrderSid(String orderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delAppOrderTrailerBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PriceVo> getPriceInfo(String sid) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java

@@ -36,7 +36,7 @@ public class OrderStateVo implements Vo {
     @ApiModelProperty("上装名称")
     private String topName;
 
-    @ApiModelProperty("挂车状态")
+    @ApiModelProperty("挂车列表是否有数据（1有 0无）")
     private int trailerInfoState;
 
     @ApiModelProperty("价格信息")
@@ -83,6 +83,8 @@ public class OrderStateVo implements Vo {
 
     @ApiModelProperty("是否有上装")
     private boolean topState;
+    @ApiModelProperty("是否有挂车按钮")
+    private boolean trailerState;
     @ApiModelProperty("上装的采购类型是否允许修改")
     @JsonProperty("isMain")
     private boolean isMain;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class AppSalesOrderTrailerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("序号")
+    private Integer sort; // 序号
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto <br/>
+ * Description: 销售订单-挂车信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 数据传输对象", description = "销售订单-挂车信息 数据传输对象")
+public class AppSalesOrderTrailerDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private BigDecimal appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+	@ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+	@ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("序号")
+    private Integer sort; // 序号
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer;
+
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/2 13:55
+ * @Description 销售订单-主车优惠
+ */
+@Data
+public class TrailerVo implements Vo {
+    private static final long serialVersionUID = -1835469698115349175L;
+
+    private String total;
+    private List<AppSalesOrderTrailerDetailsVo> records;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -45,6 +45,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -226,6 +229,21 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.deleteDiscount(orderSid, sid);
     }
 
+    @Override
+    public ResultBean<TrailerVo> getAppTrailerListVoByOrderSid(String orderSid) {
+        return appBusSalesOrderService.getAppTrailerListVoByOrderSid(orderSid);
+    }
+
+    @Override
+    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
+        return appBusSalesOrderService.saveOrUpdateAppOrderTrailer(dto);
+    }
+
+    @Override
+    public ResultBean delAppOrderTrailerBySid(String sid) {
+        return appBusSalesOrderService.delAppOrderTrailerBySid(sid);
+    }
+
     /**
      * 初始化价格信息
      *

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -70,6 +70,10 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo;
 import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery;
@@ -110,6 +114,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.base.common.SystemVo;
@@ -186,6 +193,8 @@ public class AppBusSalesOrderService {
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -937,4 +946,45 @@ public class AppBusSalesOrderService {
         ResultBean delegate = busSalesOrderFeign.assignTask(delegateQuery1);
         return rb.success();
     }
+
+    public ResultBean<TrailerVo> getAppTrailerListVoByOrderSid(String orderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        TrailerVo trailerVo = new TrailerVo();
+        List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
+        List<AppSalesOrderTrailerDetailsVo> appSalesOrderTrailerDetailsVos = new ArrayList<>();
+        for (BusSalesOrderTrailerDetailsVo datum : data) {
+            AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo();
+            BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile");
+            List<BusSalesOrderTrailerFile> contractFile = datum.getContractFile();
+            List<BusSalesOrderTrailerFile> certFile = datum.getCertFile();
+            ArrayList<String> contractFileString = new ArrayList<>();
+            ArrayList<String> certFileString = new ArrayList<>();
+            for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
+                contractFileString.add(busSalesOrderTrailerFile.getUrl());
+            }
+            for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
+                certFileString.add(busSalesOrderTrailerFile.getUrl());
+            }
+            appSalesOrderTrailerDetailsVo.setContractFile(contractFileString);
+            appSalesOrderTrailerDetailsVo.setCertFile(certFileString);
+            appSalesOrderTrailerDetailsVo.setAppearanceSizeLong("长" + appSalesOrderTrailerDetailsVo.getAppearanceSizeLong() + "m");
+            appSalesOrderTrailerDetailsVos.add(appSalesOrderTrailerDetailsVo);
+        }
+        tr
+        return rb.success().setData(trailerVo);
+    }
+
+    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
+        List<BusSalesOrderTrailerDto> busSalesOrderTrailerDtos = new ArrayList<>();
+        for (AppSalesOrderTrailerDto appSalesOrderTrailerDto : dto) {
+            BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto();
+            BeanUtil.copyProperties(appSalesOrderTrailerDto,busSalesOrderTrailerDto);
+            busSalesOrderTrailerDtos.add(busSalesOrderTrailerDto);
+        }
+        return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDtos);
+    }
+
+    public ResultBean delAppOrderTrailerBySid(String sid) {
+        return busSalesOrderTrailerFeign.delete(sid);
+    }
 }

doc/databases/yxt-as.sql

@@ -204,7 +204,7 @@ CREATE TABLE `as_busclaim_invoice_bill_detail`
     `billSid`            varchar(64)          DEFAULT NULL COMMENT '单据sid',
     `claimBillNo`        varchar(64)          DEFAULT NULL COMMENT '索赔单号',
     `repairBillNo`       varchar(64)          DEFAULT NULL COMMENT '维修工单号',
-    `vehmark`            varchar(64)          DEFAULT NULL COMMENT '车牌号',
+    `vehMark`            varchar(64)          DEFAULT NULL COMMENT '车牌号',
     `vinNo`              varchar(64)          DEFAULT NULL COMMENT '车架号',
     `claimHourAmount`    decimal(10, 2)       DEFAULT NULL COMMENT '索赔工时费',
     `claimGoodsAmount`   decimal(10, 2)       DEFAULT NULL COMMENT '索赔材料费',

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java

@@ -22,7 +22,7 @@ public class AsBusclaimCheckApplyDetail extends BaseEntity {
     @ApiModelProperty("维修工单号")
     private String repairBillNo;
     @ApiModelProperty("车牌号")
-    private String vehmark;
+    private String vehMark;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("开票申请sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.as.api.asbusclaiminvoicebill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,7 +22,20 @@ public class AsBusclaimInvoiceBillDetailsVo {
     private String createBySid;
     private String createByName;
 
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
+
+    private String billNo;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
 
     @ApiModelProperty("申请部门sid")
     private String createDeptSid;
@@ -41,7 +56,7 @@ public class AsBusclaimInvoiceBillDetailsVo {
     private String useOrgSid;
     private String useOrgName;
 
-    private List<String> fileList = new ArrayList<>();
+    private List<AsBusclaimInvoiceBillFile> fileList = new ArrayList<>();
     private String remarks;
 
     private List<AsBusclaimInvoiceBillDetailVo> detailList = new ArrayList<>();

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java

@@ -19,7 +19,17 @@ public class AsBusclaimInvoiceBillDto {
     private String createBySid;
     private String createByName;
 
-    private String createTime;
+    private String billNo;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
 
     @ApiModelProperty("申请部门sid")
     private String createDeptSid;
@@ -40,7 +50,7 @@ public class AsBusclaimInvoiceBillDto {
     private String useOrgSid;
     private String useOrgName;
 
-    private List<String> fileList = new ArrayList<>();
+    private List<AsBusclaimInvoiceBillFile> fileList = new ArrayList<>();
     private String remarks;
 
     private List<AsBusclaimInvoiceBillDetailDto> detailList = new ArrayList<>();

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AsBusclaimInvoiceBillFile implements Vo {
+
+    private String url;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java

@@ -32,7 +32,7 @@ public class AsBusclaimInvoiceBillQuery implements Query {
     @ApiModelProperty("开票名称")
     private String invoiceName;
     @ApiModelProperty("开票类型key")
-    private String invoiceKey;
+    private String invoiceValue;
 
     private String createBySid;
     private String orgPath;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java

@@ -35,5 +35,8 @@ public class AsBusclaimInvoiceBillVo {
     private String invoiceValue;
     @ApiModelProperty("开票金额")
     private String invoiceMoney;
-
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java

@@ -12,18 +12,24 @@ import lombok.Data;
 @Data
 public class ExcelInfoVo {
 
+    @ApiModelProperty("维修工单号")
+    private String billNo;
+    @ApiModelProperty("车牌号")
+    private String vinNo;
+    @ApiModelProperty("车架号")
+    private String vehMark;
     @ApiModelProperty("索赔单号")
     private String claimBillNo;
     @ApiModelProperty("索赔工时费")
-    private String claimHourAmount;
+    private String claimHourAmount = "0";
     @ApiModelProperty("索赔材料费")
-    private String claimGoodsAmount;
+    private String claimGoodsAmount = "0";
     @ApiModelProperty("外出费")
-    private String claimOutAmount;
+    private String claimOutAmount = "0";
     @ApiModelProperty("厂家补助")
-    private String claimSubsidyAmount;
+    private String claimSubsidyAmount = "0";
     @ApiModelProperty("其他费用")
-    private String claimOtherAmount;
+    private String claimOtherAmount = "0";
     @ApiModelProperty("费用是否一致")
     private Boolean isUnanimous;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java

@@ -21,7 +21,7 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity {
     @ApiModelProperty("维修工单号")
     private String repairBillNo;
     @ApiModelProperty("车牌号")
-    private String vehmark;
+    private String vehMark;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("索赔工时费")
@@ -34,4 +34,6 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity {
     private BigDecimal claimSubsidyAmount;
     @ApiModelProperty("其他费用")
     private BigDecimal claimOtherAmount;
+    @ApiModelProperty("费用是否一致")
+    private Boolean isUnanimous;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java

@@ -18,7 +18,7 @@ public class AsBusclaimInvoiceBillDetailDto {
     @ApiModelProperty("维修工单号")
     private String repairBillNo;
     @ApiModelProperty("车牌号")
-    private String vehmark;
+    private String vehMark;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("索赔工时费")
@@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillDetailDto {
     private String claimSubsidyAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;
+    @ApiModelProperty("费用是否一致")
+    private Boolean isUnanimous;
 
     private String remarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java

@@ -18,7 +18,7 @@ public class AsBusclaimInvoiceBillDetailVo {
     @ApiModelProperty("维修工单号")
     private String repairBillNo;
     @ApiModelProperty("车牌号")
-    private String vehmark;
+    private String vehMark;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("索赔工时费")
@@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillDetailVo {
     private String claimSubsidyAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;
+    @ApiModelProperty("费用是否一致")
+    private Boolean isUnanimous;
 
     private String remarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml

@@ -11,7 +11,7 @@
             resultType="com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo">
         select a.claimBillNo,
                a.repairBillNo,
-               a.vehmark,
+               a.vehMark,
                a.vinNo,
                a.claimHourAmount,
                a.claimGoodsAmount,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java

@@ -26,4 +26,6 @@ public interface AsBusclaimInvoiceBillMapper extends BaseMapper<AsBusclaimInvoic
     int updateFlowFiled(Map<String, Object> beanToMap);
 
     AsBusclaimInvoiceBillDetailsVo init(String deptSid);
+
+    String selectNum(String billNo);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml

@@ -20,10 +20,10 @@
     </select>
 
     <select id="selectBySid" resultType="int">
-        select count(*)
+        SELECT COUNT(*)
-        from as_busclaim_invoice_bill
+        FROM as_busclaim_invoice_bill
-        where length(nodeState) > 0
+        WHERE nodeState != '待提交'
-          and find_in_set(sid, #{list})
+		  and find_in_set(sid, #{list})
     </select>
 
     <update id="updateFlowFiled">
@@ -53,7 +53,16 @@
         FROM
                 as_busclaim_invoice_bill
         WHERE createDeptSid = #{deptSid}
+        AND nodeState = '已办结'
         ORDER BY createTime DESC
                 LIMIT 1
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from as_busclaim_invoice_bill
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@@ -87,8 +87,8 @@ public class AsBusclaimInvoiceBillRest {
 
     @ApiOperation(value = "导入")
     @PostMapping("/getExcelInfo")
-    ResultBean<List<ExcelInfoVo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam(value = "useOrgSid") String useOrgSid) throws IOException {
+    ResultBean<List<ExcelInfoVo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException {
-        return asBusclaimInvoiceBillService.getExcelInfo(file, request, useOrgSid);
+        return asBusclaimInvoiceBillService.getExcelInfo(file, request);
     }
 
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -13,10 +13,13 @@ import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
 import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo;
+import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckService;
 import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper;
 import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService;
+import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
+import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
 import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
@@ -76,6 +79,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
     @Autowired
     private AsBusclaimBillService asBusclaimBillService;
     @Autowired
+    private AsBusrepairBillVechService asBusrepairBillVechService;
+    @Autowired
     private FlowFeign flowFeign;
     @Autowired
     private MessageFeign messageFeign;
@@ -122,8 +127,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
             qw.like("a.invoiceName", query.getInvoiceName());
         }
         //开票类型
-        if (StringUtils.isNotBlank(query.getInvoiceKey())) {
+        if (StringUtils.isNotBlank(query.getInvoiceValue())) {
-            qw.eq("a.invoiceKey", query.getInvoiceKey());
+            qw.like("a.invoiceValue", query.getInvoiceValue());
         }
 
         IPage<AsBusclaimInvoiceBill> page = PagerUtil.queryToPage(pagerQuery);
@@ -135,22 +140,42 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
     public ResultBean<String> saveOrUpdateBill(AsBusclaimInvoiceBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+        dto.setUseOrgSid(dto.getUseOrgSid());
+        dto.setUseOrgName(organizationVo.getName());
+        dto.setCreateOrgSid(dto.getUseOrgSid());
         if (StringUtils.isBlank(sid)) {
             AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            billNo = "SPKP" + organizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
             asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
             sid = asBusclaimInvoiceBill.getSid();
-            List<String> fileList = dto.getFileList();
+            List<AsBusclaimInvoiceBillFile> fileList = dto.getFileList();
             fileList.removeAll(Collections.singleton(null));
             if (!fileList.isEmpty()) {
-                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                String url = "";
-                asBusclaimInvoiceBill.setFile(files);
+                for (AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile : fileList) {
+                    String filePath = asBusclaimInvoiceBillFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                    url = url + filePath + ",";
+                }
+                asBusclaimInvoiceBill.setFile(url);
             }
             List<AsBusclaimInvoiceBillDetailDto> detailList = dto.getDetailList();
             detailList.removeAll(Collections.singleton(null));
             if (!detailList.isEmpty()) {
                 asBusclaimInvoiceBillDetailService.saveOrUpdateDetails(sid, detailList);
             }
+            asBusclaimInvoiceBill.setNodeState("待提交");
             baseMapper.insert(asBusclaimInvoiceBill);
 
         } else {
@@ -159,11 +184,15 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
-            List<String> fileList = dto.getFileList();
+            List<AsBusclaimInvoiceBillFile> fileList = dto.getFileList();
             fileList.removeAll(Collections.singleton(null));
             if (!fileList.isEmpty()) {
-                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                String url = "";
-                asBusclaimInvoiceBill.setFile(files);
+                for (AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile : fileList) {
+                    String filePath = asBusclaimInvoiceBillFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                    url = url + filePath + ",";
+                }
+                asBusclaimInvoiceBill.setFile(url);
             }
             List<AsBusclaimInvoiceBillDetailDto> detailList = dto.getDetailList();
             detailList.removeAll(Collections.singleton(null));
@@ -200,7 +229,13 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         BeanUtil.copyProperties(asBusclaimInvoiceBill, asBusclaimInvoiceBillDetailsVo);
         if (StringUtils.isNotBlank(asBusclaimInvoiceBill.getFile())) {
             List<String> fileList = Arrays.asList(asBusclaimInvoiceBill.getFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-            asBusclaimInvoiceBillDetailsVo.setFileList(fileList);
+            List<AsBusclaimInvoiceBillFile> asBusclaimInvoiceBillFiles = new ArrayList<>();
+            for (String s : fileList) {
+                AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile = new AsBusclaimInvoiceBillFile();
+                asBusclaimInvoiceBillFile.setUrl(s);
+                asBusclaimInvoiceBillFiles.add(asBusclaimInvoiceBillFile);
+            }
+            asBusclaimInvoiceBillDetailsVo.setFileList(asBusclaimInvoiceBillFiles);
         }
         List<AsBusclaimInvoiceBillDetailVo> detailList = asBusclaimInvoiceBillDetailService.selectDetails(sid);
         detailList.removeAll(Collections.singleton(null));
@@ -354,7 +389,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
                         asBusclaimCheckDto.setBillInvoiceSid(businessSid);
                         asBusclaimCheckDto.setBillInvoiceDetailSid(asBusclaimInvoiceBillDetail.getSid());
                         asBusclaimCheckDto.setBillNo(asBusclaimInvoiceBillDetail.getClaimBillNo());
-                        asBusclaimCheckDto.setVehMark(asBusclaimInvoiceBillDetail.getVehmark());
+                        asBusclaimCheckDto.setVehMark(asBusclaimInvoiceBillDetail.getVehMark());
                         asBusclaimCheckDto.setVinNo(asBusclaimInvoiceBillDetail.getVinNo());
                         list.add(asBusclaimCheckDto);
                     }
@@ -536,7 +571,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         return rb.success();
     }
 
-    public ResultBean<List<ExcelInfoVo>> getExcelInfo(MultipartFile file, HttpServletRequest request, String useOrgSid) throws IOException {
+    public ResultBean<List<ExcelInfoVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
         ResultBean rb = ResultBean.fireFail();
         String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
         File tempFile = new File(temp);
@@ -561,7 +596,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
             wb = new XSSFWorkbook(is);
         }
         Sheet sheet = wb.getSheetAt(0);
-        ReturnExcelInfoVo importReturn = getSheetVal(sheet, resultCell, useOrgSid);
+        ReturnExcelInfoVo importReturn = getSheetVal(sheet, resultCell);
         list = importReturn.getInfos();
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
             return rb.setMsg(importReturn.getCheckInfo());
@@ -570,7 +605,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         }
     }
 
-    private ReturnExcelInfoVo getSheetVal(Sheet sheet, int[] resultCell, String useOrgSid) {
+    private ReturnExcelInfoVo getSheetVal(Sheet sheet, int[] resultCell) {
         ReturnExcelInfoVo returnExcelInfoVo = new ReturnExcelInfoVo();
         List<ExcelInfoVo> importVoList = new ArrayList<>();
         Set<String> checkWord = new HashSet<>();
@@ -666,6 +701,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
                         }else {
                             excelInfoVo.setIsUnanimous(true);
                         }
+                        excelInfoVo.setBillNo(asBusclaimBill.getRepairBillNo());
+                        AsBusrepairBillVech asBusrepairBillVech = asBusrepairBillVechService.fetchByBillSid(asBusclaimBill.getRepairBillSid());
+                        excelInfoVo.setVinNo(asBusrepairBillVech.getVinNo());
+                        excelInfoVo.setVehMark(asBusrepairBillVech.getVehMark());
                     }
                 }
             }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml

@@ -11,7 +11,7 @@
             resultType="com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo">
         select a.claimBillNo,
                a.repairBillNo,
-               a.vehmark,
+               a.vehMark,
                a.vinNo,
                a.claimHourAmount,
                a.claimGoodsAmount,