Merge remote-tracking branch 'origin/master'

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

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
@@ -48,6 +49,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -132,6 +135,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private BaseTrailerService baseTrailerService;
+    @Autowired
+    private FinBillVehicleFeign finBillVehicleFeign;
 
     /**
      * 车辆信息分页列表
@@ -3834,18 +3839,28 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public PagerVo<BaseVehicleQKKPVo> vehicleQKKPList(PagerQuery<BaseVehicleQKKPQuery> pagerQuery) {
         IPage<BaseVehicleQKKPVo> page = vehicleQKKPPageList(pagerQuery);
         List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
-        for (BaseVehicleQKKPVo record : page.getRecords()) {
-            List<TrailerVo> trailerVos = baseTrailerService.trailerList(record.getVehSid()).getData();
+        List<BaseVehicleQKKPVo> records = page.getRecords();
+        List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
+        for (BaseVehicleQKKPVo record : records) {
+            Integer count = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
+            if (count == 0){
+                recordsNew.add(record);
+            }
+        }
+        for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {
+            TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid()).getData();
+            List<TrailerVo> trailerVos = data.getList();
             if (trailerVos != null && trailerVos.size() > 0){
                 for (TrailerVo trailerVo : trailerVos) {
                     BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo();
-                    baseVehicleQKKPTrailerVo.setVinNo(record.getVinNo());
+                    baseVehicleQKKPTrailerVo.setVinNo(baseVehicleQKKPVo.getVinNo());
                     baseVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
                     baseVehicleQKKPTrailerVos.add(baseVehicleQKKPTrailerVo);
                 }
             }
-            record.setTrailers(baseVehicleQKKPTrailerVos);
+            baseVehicleQKKPVo.setTrailers(baseVehicleQKKPTrailerVos);
         }
+        page.setRecords(recordsNew);
         PagerVo<BaseVehicleQKKPVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleQKKPVo> pv1 = PagerUtil.pageToVo(page, pv);
         return pv1;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -204,7 +204,7 @@
             resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo">
         select *
         from base_vehicle_certificate
-        where vehicleSid = #{sid}
+        where vehicleSid = #{sid} limit 1
     </select>
 
     <select id="selectByVinNoAndOrgSid"

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -74,6 +74,12 @@ public class AppDeliveredDetailsVo implements Vo {
     @ApiModelProperty("车辆集合")
     private List<AppCarListVo> carList;
 
+    @ApiModelProperty(value = "实例id")
+    private String procInstId;
+
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+
 
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyCompleteDto.java

@@ -15,7 +15,7 @@ public class BusDeliveredApplyCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -193,7 +194,8 @@ public interface BusDeliveredApplyFeign {
     @ApiOperation("手机端-初始化 出库申请")
     @GetMapping("/getRetrievalApplyInfoBySid")
     @ResponseBody
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
+//    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -146,7 +147,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+
+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.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 14:31
+ */
+@Data
+@ApiModel(value = "优惠包交接表", description = "优惠包交接表")
+@TableName("bus_discountpackage_handover")
+public class BusDiscountpackageHandover extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("车型名称")
+    private String vehModel; // 车型名称
+    @ApiModelProperty("车辆台数")
+    private String vehCount; // 车辆台数
+    @ApiModelProperty("车架号")
+    private String vins; // 车架号
+    @ApiModelProperty("接收人用户sid")
+    private String recUserSid; // 接收人用户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("接收人姓名")
+    private String recName; // 接收人姓名
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("接收人电话")
+    private String recPhone; // 接收人电话
+    @ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 创建组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 库存状态value
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:45
+ */
+@ApiModel(value = "优惠包交接表 数据传输对象", description = "优惠包交接表 数据传输对象")
+@Data
+public class BusDiscountpackageHandoverDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid; // sid
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("车型名称")
+    private String vehModel; // 车型名称
+    @ApiModelProperty("车辆台数")
+    private String vehCount; // 车辆台数
+    @ApiModelProperty("车架号")
+    private String vins; // 车架号
+    @ApiModelProperty("接收人用户sid")
+    private String recUserSid; // 接收人用户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("接收人姓名")
+    private String recName; // 接收人姓名
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("接收人电话")
+    private String recPhone; // 接收人电话
+    @ApiModelProperty("业务sid")
+    private String busSid; // 业务sid
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 创建组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 库存状态value
+    @ApiModelProperty("优惠包交接优惠包列表")
+    private List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+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.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 14:58
+ */
+
+@Api(tags = "优惠包交接表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusDiscountpackageHandover",
+        name = "anrui-buscenter",
+        path = "v1/busdiscountpackagehandover",
+        fallback = BusDiscountpackageHandoverFeignFallback.class)
+public interface BusDiscountpackageHandoverFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(@RequestBody PagerQuery<BusDiscountpackageHandoverQuery> pq);
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusDiscountpackageHandoverDto dto);
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+
+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;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:01
+ */
+
+@Component
+public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpackageHandoverFeign{
+
+    @Override
+    public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean save(BusDiscountpackageHandoverDto dto) {
+        return null;
+    }
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:04
+ */
+
+@ApiModel(value = "优惠包交接表 查询条件", description = "优惠包交接表 查询条件")
+@Data
+public class BusDiscountpackageHandoverQuery implements Query {
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:03
+ */
+@Data
+@ApiModel(value = "优惠包交接表-视图数据对象", description = "优惠包交接表-视图数据对象")
+public class BusDiscountpackageHandoverVo implements Vo {
+
+    @ApiModelProperty("交接状态 0待准备1待交接2已交接")
+    private Integer state; // 交接状态
+    @ApiModelProperty("创建日期")
+    private Date createTime; // 合同编号
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("车型名称")
+    private String vehModel; // 车型名称
+    @ApiModelProperty("车辆台数")
+    private String vehCount; // 车辆台数
+    @ApiModelProperty("接收人姓名")
+    private String recName; // 接收人姓名
+    @ApiModelProperty("接收人电话")
+    private String recPhone; // 接收人电话
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverList.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
+
+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;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:04
+ */
+@ApiModel(value = "优惠包交接优惠包列表", description = "优惠包交接优惠包列表")
+@TableName("bus_discountpackage_handoverlist")
+@Data
+public class BusDiscountpackageHandoverList extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("交接表sid")
+    private String mainSid; // 交接表sid
+    @ApiModelProperty("价值")
+    private Integer price; // 价值
+    @ApiModelProperty("数量")
+    private String number; // 数量
+    @ApiModelProperty("优惠包说明")
+    private String explain; // 优惠包说明
+    @ApiModelProperty("总价值")
+    private Integer totalPrice; // 总价值
+    @ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:11
+ */
+
+@ApiModel(value = "优惠包交接优惠包列表 数据传输对象", description = "优惠包交接优惠包列表 数据传输对象")
+@Data
+public class BusDiscountpackageHandoverListDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid; // sid
+    @ApiModelProperty("交接表sid")
+    private String mainSid; // 交接表sid
+    @ApiModelProperty("价值")
+    private Integer price; // 价值
+    @ApiModelProperty("数量")
+    private String number; // 数量
+    @ApiModelProperty("优惠包说明")
+    private String explain; // 优惠包说明
+    @ApiModelProperty("总价值")
+    private Integer totalPrice; // 总价值
+    @ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:13
+ */
+
+@Api(tags = "优惠包交接优惠包列表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusDiscountpackageHandoverList",
+        name = "anrui-buscenter",
+        path = "v1/busdiscountpackagehandoverlist",
+        fallback = BusDiscountpackageHandoverListFeignFallback.class)
+public interface BusDiscountpackageHandoverListFeign {
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusDiscountpackageHandoverListDto dto);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:14
+ */
+
+@Component
+public class BusDiscountpackageHandoverListFeignFallback implements BusDiscountpackageHandoverListFeign {
+    @Override
+    public ResultBean save(BusDiscountpackageHandoverListDto dto) {
+        return null;
+    }
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -83,6 +83,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
+    @ApiOperation("根据合同编号判断销售订单中单台开票价是否为空")
+    @GetMapping("/fetchByContractNo/{contractNo}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(@PathVariable("contractNo") String contractNo);
+
     @ApiOperation("编辑初始化")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -74,6 +74,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/delBySids无法访问");
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(String contractNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderIsDTKPJVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/6 16:57
+ * @Description
+ */
+@Data
+public class BusSalesOrderIsDTKPJVo implements Vo {
+
+    @ApiModelProperty("是否修改")
+    private Boolean isEdit;
+    @ApiModelProperty("单台开票金额")
+    private String oneBillMoney;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -328,7 +328,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
                 AppCarListVo appCarListVo = new AppCarListVo();
                 appCarListVo.setVinSid(list.get(i));
-                appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
+//                appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
                 //查询该车辆是否有挂车
                 ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid);
                 if (trailerList.getData().getList().isEmpty()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -214,9 +215,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
+        ResultBean<AppDeliveredDetailsVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
         return rb.success().setData(retrievalApplyInfo.getData());
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -30,10 +30,16 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
+import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
@@ -41,7 +47,6 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountsVo;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoVo;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessagesVo;
@@ -54,12 +59,19 @@ import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -126,6 +138,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
     @Autowired
     private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BaseTrailerFeign baseTrailerFeign;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private FinBillApplicationFeign finBillApplicationFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -455,18 +477,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath = dto.getOrgPath();
-        /*//根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }*/
-        //用户的组织全路径
-//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, busDeliveredApply);
         if (r == 3) {
@@ -575,6 +585,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(busDeliveredApply.getOrgSidPath());
         if (bv.getTaskId().equals(busDeliveredApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -583,7 +594,61 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 baseMapper.updateStateBySid(3, bv.getBusinessSid());
                 //推送开票申请
+                List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
+                FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
+                finBillApplicationDto.setUseOrgSid(busDeliveredApply.getUseOrgSid());
+                finBillApplicationDto.setCreateBySid(busDeliveredApply.getApplySid());
+                finBillApplicationDto.setCreateByName(busDeliveredApply.getApplyName());
+                finBillApplicationDto.setContractNo(busDeliveredApply.getContractNo());
+                //根据合同编号查询销售订单的信息
+                ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
+                if (!resultBean.getSuccess()) {
+                    log.error("获取销售订单详情出错啦！！！");
+                    return rb;
+                }
+                AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
+                finBillApplicationDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                finBillApplicationDto.setCustomerName(busDeliveredApply.getName());
+                finBillApplicationDto.setDeptSid(busDeliveredApply.getApplyDeptSid());
+                finBillApplicationDto.setDeptName(busDeliveredApply.getApplyDept());
+                //根据用户sid查询staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                finBillApplicationDto.setStaffSid(userVoResultBean.getData().getStaffSid());
+                finBillApplicationDto.setStaffName(busDeliveredApply.getStaffName());
+                finBillApplicationDto.setSaleDeptSid(busDeliveredApply.getStaffDeptSid());
+                finBillApplicationDto.setSaleDeptName(busDeliveredApply.getStaffDeptName());
+                finBillApplicationDto.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey());
+                finBillApplicationDto.setSaleTypeValue(busDeliveredApply.getPaymentMethod());
+                //开票单位
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        finBillApplicationDto.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+                finBillApplicationDto.setBillStateKey(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getCode());
+                finBillApplicationDto.setBillStateValue(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getRemarks());
+                List<FinBillVehicleDto> finBillVehicles = new ArrayList<>();
+                for (int i = 0; i < detailsList.size(); i++) {
+                    FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
+                    BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+                    finBillVehicleDto.setVinNo(busDeliveredApplyDetails.getVinNo());
+                    finBillVehicleDto.setVehSid(busDeliveredApplyDetails.getVinSid());
+                    //合格证状态
+                    BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData();
+                    if (baseVehicleCertificate == null) {
+                        finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
+                        finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateSituationValue());
 
+                    }
+                    finBillVehicles.add(finBillVehicleDto);
+                }
+                finBillApplicationDto.setFinBillVehicles(finBillVehicles);
+                finBillApplicationDto.setArrearsMoney("0");
+                ResultBean finBillResult = finBillApplicationFeign.save(finBillApplicationDto);
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             return rb.success().setData(resultBean.getData());
@@ -730,7 +795,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param pagerQuery
      * @return
      */
-    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
+    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList
+    (PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         QueryWrapper<AppDeliveredApplyPageQuery> qw = new QueryWrapper<>();
         String orgPath = pagerQuery.getParams().getOrgPath();
         String orgSid = "";
@@ -1051,9 +1117,71 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(sid);
     }
 
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
-        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
-        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
+        ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
+        AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();
+        //根据sid获取出库申请
+        BusDeliveredApply busDeliveredApply = fetchBySid(sid);
+        if (busDeliveredApply == null) {
+            return rb.setMsg("该出库申请不存在");
+        }
+        appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath());
+        appDeliveredDetailsVo.setSid(sid);
+        BeanUtil.copyProperties(busDeliveredApply, appDeliveredDetailsVo, "sid");
+        appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo());
+        appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
+        appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd"));
+        if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) {
+            appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元");
+        }
+        if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) {
+            appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元");
+        }
+        List<AppCarListVo> carList = new ArrayList<>();
+        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        for (int i = 0; i < detailsList.size(); i++) {
+            BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+            AppCarListVo appCarListVo = new AppCarListVo();
+            appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
+            appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
+            //查询该车辆是否有挂车
+            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid());
+            if (trailerList.getData().getList().isEmpty()) {
+                appCarListVo.setShowHandCarBtn(false);
+            } else {
+                appCarListVo.setShowHandCarBtn(true);
+            }
+            //优惠包使用情况
+            List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
+            List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
+            for (int j = 0; j < discountsList.size(); j++) {
+                BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
+                BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
+                busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
+                busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
+                busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
+                busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
+                busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
+                busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
+                discountUse.add(busDeliveredDetailsDiscountsVo);
+            }
+            appCarListVo.setDiscountUse(discountUse);
+            //使用人信息
+            BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
+            BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+            BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+            realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
+            appCarListVo.setRealBuyer(realBuyer);
+            carList.add(appCarListVo);
+        }
+        appDeliveredDetailsVo.setCarList(carList);
+        //获取实际购车人的数据
+        ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");
+        List<DictCommonVo> dictCommonVoList = listResultBean.getData();
+        List<DeliveredDictVo> voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList());
+        appDeliveredDetailsVo.setBuyerType(voList);
+
+       /* AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         BeanUtil.copyProperties(busDeliveredApply, vo);
 
@@ -1075,7 +1203,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             for (int i = 0; i < voList.size(); i++) {
-              /* BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+               BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
                 AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
                 appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
                 appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
@@ -1084,12 +1212,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appUseInfoVo.setProvince(busDeliveredUseMessage.getProvince());
                 appUseInfoVo.setCity(busDeliveredUseMessage.getCity());
                 appUseInfoVo.setCounty(busDeliveredUseMessage.getCounty());
-                voList.get(i).setUseInfo(appUseInfoVo);*/
+                voList.get(i).setUseInfo(appUseInfoVo);
             }
             vo.setCarList(voList);
         }
-        vo.setSid(sid);
-        return rb.success().setData(vo);
+        vo.setSid(sid);*/
+        return rb.success().setData(appDeliveredDetailsVo);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1160,13 +1288,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-        appMap.put("outboundSid", businessSid);
+        appMap.put("sid", businessSid);
         appMap.put("contractId", busDeliveredApply.getContractNo());
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if(!voResultBean.getSuccess()){
+                return rb.setMsg(voResultBean.getMsg());
+            }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -1194,6 +1325,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }
+
         return rb;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:09
+ */
+@Mapper
+public interface BusDiscountpackageHandoverMapper extends BaseMapper<BusDiscountpackageHandover> {
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -0,0 +1,7 @@
+<?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.busdiscountpackagehandover.BusDiscountpackageHandoverMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
+
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverQuery;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:09
+ */
+@Api(tags = "优惠包交接表")
+@RestController
+@RequestMapping("v1/busdiscountpackagehandover")
+public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandoverFeign {
+
+    @Autowired
+    private BusDiscountpackageHandoverService busDiscountpackageHandoverService;
+
+    @Override
+    public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean save(BusDiscountpackageHandoverDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busDiscountpackageHandoverService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
+
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 15:09
+ */
+@Service
+public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDiscountpackageHandoverMapper, BusDiscountpackageHandover> {
+
+    @Autowired
+    private BusDiscountpackageHandoverListService busDiscountpackageHandoverListService;
+
+    /**
+     * 新增
+     *
+     * @param dto
+     */
+    public void saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
+        BusDiscountpackageHandover entity = new BusDiscountpackageHandover();
+        String sid = entity.getSid();
+        dto.setSid(sid);
+        dto.fillEntity(entity);
+        List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
+        if (null != listDtos) {
+            for (BusDiscountpackageHandoverListDto listDto : listDtos) {
+                listDto.setMainSid(entity.getSid());
+                BusDiscountpackageHandoverList handoverList = new BusDiscountpackageHandoverList();
+                String listSid = handoverList.getSid();
+                listDto.setMainSid(sid);
+                listDto.setSid(listSid);
+                listDto.fillEntity(handoverList);
+                busDiscountpackageHandoverListService.save(handoverList);
+            }
+        }
+        this.save(entity);
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:18
+ */
+@Mapper
+public interface BusDiscountpackageHandoverListMapper  extends BaseMapper<BusDiscountpackageHandoverList> {
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.xml

@@ -0,0 +1,7 @@
+<?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.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListFeign;
+import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:16
+ */
+@Api(tags = "优惠包交接优惠包列表")
+@RestController
+@RequestMapping("v1/busdiscountpackagehandoverlist")
+public class BusDiscountpackageHandoverListRest implements BusDiscountpackageHandoverListFeign {
+
+    @Autowired
+    private BusDiscountpackageHandoverListService busDiscountpackageHandoverListService;
+
+    @Override
+    public ResultBean save(BusDiscountpackageHandoverListDto dto) {
+
+        ResultBean rb = ResultBean.fireFail();
+        busDiscountpackageHandoverListService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/13 16:16
+ */
+@Service
+public class BusDiscountpackageHandoverListService extends MybatisBaseService<BusDiscountpackageHandoverListMapper, BusDiscountpackageHandoverList> {
+
+
+    public void saveOrUpdateDto(BusDiscountpackageHandoverListDto dto) {
+        BusDiscountpackageHandoverList entity = new BusDiscountpackageHandoverList();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+}

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

@@ -112,6 +112,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.deleteSids(sids);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(String contractNo) {
+        return busSalesOrderService.fetchByContractNo(contractNo);
+    }
+
     /**
      * 销售订单初始化
      *

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

@@ -5892,4 +5892,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
         return resultBean;
     }
+
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
+        BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
+        BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+        if (oneBillMoney == null){
+            busSalesOrderIsDTKPJVo.setIsEdit(false);
+            busSalesOrderIsDTKPJVo.setOneBillMoney("");
+        }else {
+            busSalesOrderIsDTKPJVo.setIsEdit(true);
+            busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
+        }
+        return rb.success().setData(busSalesOrderIsDTKPJVo);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageVo.java

@@ -42,4 +42,12 @@ public class AppBillApplicationPageVo implements Vo {
     @ApiModelProperty("是否显示修改按钮 合同提交后/开始走流程不显示")
     private boolean isShowUpData;
 
+    @ApiModelProperty("销售类型")
+    private String saleType;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("开票单位")
+    private String billUnit;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -154,6 +154,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息
     @ApiModelProperty("开票挂车信息")
     private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
+    @ApiModelProperty("证件")
+    private List<FinBillFileVo> zjApplicationAppendxs; // 证件
     @ApiModelProperty("客户开票申请书")
     private List<FinBillFileVo> khkpsqsApplicationAppendxs; // 客户开票申请书
     @ApiModelProperty("开票信息确认书")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -87,7 +87,6 @@ public interface FinBillApplicationFeign {
     @ResponseBody
     public ResultBean saveQK(@RequestBody FinBillApplicationDto dto);
 
-
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -137,6 +136,13 @@ public interface FinBillApplicationFeign {
     @PostMapping("/completeQK")
     public ResultBean completeQK(@Valid @RequestBody FinBillCompleteDto query);
 
+    /**
+     * 分公司到风控中心同意
+     */
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/companyToDivisionOperateQK")
+    public ResultBean companyToDivisionOperateQK(@Valid @RequestBody FinBillCompleteDto query);
+
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForRejectQK")
     ResultBean<List<FinBillNodeVo>> getPreviousNodesForRejectQK(@Valid @SpringQueryMap FinBillNodeQuery query);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -142,6 +142,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean companyToDivisionOperateQK(FinBillCompleteDto query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<FinBillNodeVo>> getPreviousNodesForRejectQK(FinBillNodeQuery query) {
 		return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@@ -77,4 +77,9 @@ public class FinBillApplicationVo implements Vo {
     private String returnedMoneyDate; // 承诺回款日期
     @ApiModelProperty("欠款开票原因value")
     private String arrearsOpenYYValue; // 欠款开票原因value
+
+    @ApiModelProperty(value = "流程id")
+    private String procDefId;
+    @ApiModelProperty(value = "实例id")
+    private String procInstSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java

@@ -80,4 +80,9 @@ public interface FinBillVehicleFeign {
     @GetMapping("/selDetailsByVinNo")
     @ResponseBody
     public ResultBean<AppInvoicingInfoVinNoVo> selDetailsByVinNo(@PathVariable("vinNo") String vinNo);
+
+    @ApiOperation("根据车辆sid查询开票车辆")
+    @GetMapping("/fetchByVehSid/{vehSid}")
+    @ResponseBody
+    ResultBean<Integer> fetchByVehSid(@PathVariable("vehSid") String vehSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java

@@ -74,4 +74,9 @@ public class FinBillVehicleFeignFallback implements FinBillVehicleFeign {
 	public ResultBean<AppInvoicingInfoVinNoVo> selDetailsByVinNo(String vinNo) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<Integer> fetchByVehSid(String vehSid) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java

@@ -56,6 +56,8 @@ public class FinBillVehicleVo implements Vo {
     private String createByName; // 创建人接口
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
+    @ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("开票类型key")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -32,7 +32,10 @@
         fba.totalBillMoney,
         fba.billState,
         fba.applyDate,
-        fba.createBySid
+        fba.createBySid,
+        fba.saleTypeValue as saleType,
+        fba.modelName as model,
+        fba.openTickUnitName as billUnit
         FROM fin_bill_application fba
         <where>
             ${ew.sqlSegment}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@@ -171,6 +171,14 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
         return finBillApplicationService.completeQK(bv);
     }
 
+    @Override
+    public ResultBean companyToDivisionOperateQK(FinBillCompleteDto query) {
+        BusinessVariables bv=new BusinessVariables();
+        BeanUtil.copyProperties(query,bv);
+        bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
+        return finBillApplicationService.companyToDivisionOperateQK(bv);
+    }
+
     @Override
     public ResultBean<List<FinBillNodeVo>> getPreviousNodesForRejectQK(FinBillNodeQuery query) {
         return finBillApplicationService.getPreviousNodesForRejectQK(query);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -29,8 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
+import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.commonappendix.*;
@@ -42,6 +45,7 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -73,6 +77,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -167,7 +172,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             qw.eq("fba.billStateKey", query.getBillStateKey());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.eq("fba.createByName", query.getCreateByName());
+            qw.like("fba.createByName", query.getCreateByName());
         }
         String applyStartDate = query.getApplyStartDate();
         String applyEndDate = query.getApplyEndDate();
@@ -268,7 +273,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (finBillApplication == null) {
             rb.setMsg("该数据不存在");
         }
-        dto.setArrearsMoney("0");
         updateByDto(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
@@ -371,8 +375,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         } else {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                 BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
-                List<TrailerVo> trailerVos = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData();
-                for (TrailerVo trailerVo : trailerVos) {
+                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData();
+                List<TrailerVo> trailerVoList = data.getList();
+                for (TrailerVo trailerVo : trailerVoList) {
                     FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
                     finBillTrailerVo.setBillAppSid(sid);
                     finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo());
@@ -407,9 +412,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             fileUrl = urlPrefix + fileUrl;
             cldjhtApplicationAppendx.setFileUrl(fileUrl);
         }
+        List<FinBillFileVo> zjApplicationAppendxs = finBillFileService.fetchzjBySid(sid);
+        for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
+            String fileUrl = zjApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            zjApplicationAppendx.setFileUrl(fileUrl);
+        }
         vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
+        vo.setZjApplicationAppendxs(zjApplicationAppendxs);
         return vo;
     }
 
@@ -698,6 +711,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null){
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                }
             } else {
                 //极光推送
                 finBillApplication = fetchBySid(businessSid);
@@ -883,6 +901,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                finBillVehicleService.updateByMainSid(finBillApplication.getSid());
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -891,6 +910,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplication(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String contractNo = dto.getContractNo();
+        List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
+        if (finBillApplicationDetailsVos != null){
+            for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
+                String nodeState = finBillApplicationDetailsVo.getNodeState();
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)){
+                    return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
+                }
+            }
+        }
         //用户的组织全路径
         String orgSidPath = "";
         if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
@@ -1396,6 +1425,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
+        List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs();
         if (StringUtils.isBlank(dtoSid)) {//新增
             FinBillApplication finBillApplication = new FinBillApplication();
             BeanUtil.copyProperties(dto, finBillApplication, "sid");
@@ -1421,35 +1451,53 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillTrailerService.save(finBillTrailer);
             }
             //附件信息
-            for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
-                String filePath = finBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            if (khkpsqsApplicationAppendxs.size() > 0){
+                for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
-                finBillFileDto.setFileUrl(filePath);
-                finBillFileDto.setBillAppSid(finBillApplication.getSid());
-                finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType());
-                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
-                String filePath = finBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            if (kpxxqrsApplicationAppendxs.size() > 0){
+                for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
-                finBillFileDto.setFileUrl(filePath);
-                finBillFileDto.setBillAppSid(finBillApplication.getSid());
-                finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType());
-                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
-                String filePath = finBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            if (cldjhtApplicationAppendxs.size() > 0){
+                for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
+            if (zjApplicationAppendxs.size() > 0){
+                for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.ZJ.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
-                finBillFileDto.setFileUrl(filePath);
-                finBillFileDto.setBillAppSid(finBillApplication.getSid());
-                finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType());
-                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
@@ -1457,11 +1505,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (finBillApplication == null) {
             rb.setMsg("该数据不存在");
         }
-        dto.setArrearsMoney("0");
         updateByDto(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
-        if (khkpsqsApplicationAppendxs != null) {
+        if (khkpsqsApplicationAppendxs.size() > 0) {
             for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                 String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1473,7 +1520,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
         }
-        if (kpxxqrsApplicationAppendxs != null) {
+        if (kpxxqrsApplicationAppendxs.size() > 0) {
             for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
                 String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1485,7 +1532,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
         }
-        if (cldjhtApplicationAppendxs != null) {
+        if (cldjhtApplicationAppendxs.size() > 0) {
             for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
                 String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1497,6 +1544,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
         }
+        if (zjApplicationAppendxs.size() > 0) {
+            for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
+                String filePath = finBillFileDto.getFileUrl();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.ZJ.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
+            }
+        }
         finBillVehicleService.delByBillAppSid(dtoSid);
         for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
             FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -1516,6 +1575,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplicationQK(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String contractNo = dto.getContractNo();
+        List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
+        if (finBillApplicationDetailsVos != null){
+            for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
+                String nodeState = finBillApplicationDetailsVo.getNodeState();
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)){
+                    return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
+                }
+            }
+        }
         //用户的组织全路径
         String orgSidPath = "";
         if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
@@ -1618,6 +1687,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null){
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                }
             } else {
                 //极光推送
                 finBillApplication = fetchBySid(businessSid);
@@ -1783,6 +1857,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                finBillVehicleService.updateByMainSid(finBillApplication.getSid());
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1814,7 +1889,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             qw.eq("fba.billStateKey", query.getBillStateKey());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.eq("fba.createByName", query.getCreateByName());
+            qw.like("fba.createByName", query.getCreateByName());
         }
         String returnedMoneyStartDate = query.getReturnedMoneyStartDate();
         String returnedMoneyEndDate = query.getReturnedMoneyEndDate();
@@ -1826,4 +1901,61 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean companyToDivisionOperateQK(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
+        bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
+        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<String> candidateGroups = voList.get(0).getCandidateGroups();
+        UserRoleQuery userRoleQuery = new UserRoleQuery();
+        userRoleQuery.setRoleSid(candidateGroups.get(0));
+        List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        if (sysUserVos.size() > 0) {
+            for (SysUserVo sysUserVo : sysUserVos) {
+                String sid = sysUserVo.getSid();
+                nextNodeUserSids.append(sid).append(",");
+            }
+        }
+        if (StringUtils.isBlank(nextNodeUserSids)) {
+            return rb.setMsg("下一环节暂无操作人员");
+        }
+        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+        bv.setNextNodeUserSids(substring);
+        if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
+            Map<String, Object> variables = new HashMap<>();
+            Map<String, Object> appMap = new HashMap<>();
+            appMap.put("sid", bv.getBusinessSid());
+            variables.put("app", appMap);
+            bv.setFormVariables(variables);
+            ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
+            if (!resultBean1.getSuccess()) {
+                return rb.setMsg(resultBean1.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
+            //极光推送
+            UpdateFlowFieldVo ufVo = resultBean1.getData();
+            finBillApplication = fetchBySid(bv.getBusinessSid());
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowVo.setProcInsId(finBillApplication.getProcInstSid());
+            messageFlowVo.setProcDefId(finBillApplication.getProcDefId());
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+            messageFlowableQuery.setModuleName("欠款开票");
+            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("欠款开票");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            return rb.success().setData(resultBean1.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@@ -82,4 +82,7 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
 
 	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '003'")
 	List<FinBillFileVo> fetchcldjhtBySid(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '004'")
+    List<FinBillFileVo> fetchzjBySid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@@ -157,4 +157,8 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
 	public List<FinBillFileVo> fetchcldjhtBySid(String sid) {
 		return baseMapper.fetchcldjhtBySid(sid);
 	}
+
+	public List<FinBillFileVo> fetchzjBySid(String sid) {
+		return baseMapper.fetchzjBySid(sid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -30,10 +30,7 @@ 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.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
-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 org.apache.ibatis.annotations.*;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 
@@ -72,4 +69,10 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
     void delByBillAppSid(String dtoSid);
 
     AppInvoicingInfoVinNoVo selDetailsByVinNo(@Param("vinNo") String vinNo);
+
+	@Select("select count(*) from fin_bill_vehicle where vehSid = #{vehSid} and state = '1'")
+	Integer fetchByVehSid(String vehSid);
+
+	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")
+	void updateByMainSid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java

@@ -99,4 +99,11 @@ public class FinBillVehicleRest implements FinBillVehicleFeign {
 		AppInvoicingInfoVinNoVo vo = finBillVehicleService.selDetailsByVinNo(vinNo);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<Integer> fetchByVehSid(String vehSid) {
+		ResultBean rb = ResultBean.fireFail();
+		Integer i = finBillVehicleService.fetchByVehSid(vehSid);
+		return rb.success().setData(i);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -133,4 +133,12 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
         vo.setInvoiceImages(invoiceImages);
         return vo;
     }
+
+    public Integer fetchByVehSid(String vehSid) {
+        return baseMapper.fetchByVehSid(vehSid);
+    }
+
+    public void updateByMainSid(String sid) {
+        baseMapper.updateByMainSid(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -674,6 +674,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (fileList.size() <= 0) {
             path = null;
         } else {
+            for (File fileDelete : fileList) {
+                fileDelete.delete();
+            }
             path = filePath + dateStr + seconds + "收款收据.pdf";
         }
         return rb.success().setData(path);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java

@@ -46,4 +46,13 @@ public class BillApplicationPageVo implements Vo {
 
     @ApiModelProperty("是否显示修改按钮 合同提交后/开始走流程不显示")
     private boolean isShowUpData;
+
+    @ApiModelProperty("销售类型")
+    private String saleType;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("开票单位")
+    private String billUnit;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -85,7 +85,8 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("手机端-出库申请 详情")
     @GetMapping("/getRetrievalDetail")
     @ResponseBody
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
+//    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -74,7 +74,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     }*/
 
     @Override
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -88,4 +88,11 @@ public class DeliveredDetailsVo implements Vo {
     private List<CarListVo> carList = new ArrayList<>();
     @ApiModelProperty("剩余")
     private List<DeliveredLeaveVo> discountLeave = new ArrayList<>();
+
+    @ApiModelProperty(value = "实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class DeliveredTralierVo {
 
     @ApiModelProperty("车型信息")
-    private List<ConfigVo> modelInfo;
+    private List<ConfigVo> modeInfo;
     @ApiModelProperty("挂车列表信息")
     private List<List<ConfigVo>> handCarInfo;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -82,7 +82,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     }*/
 
     @Override
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
         return appBusDeliveredApplyService.getRetrievalDetail(sid);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -150,14 +150,14 @@ public class AppBusDeliveredApplyService {
         return rb.success().setData(voList);
     }
 
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
-        ResultBean<DeliveredApplyDetailsVo> rb = ResultBean.fireFail();
-        DeliveredApplyDetailsVo vo = new DeliveredApplyDetailsVo();
-        ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
+        ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
+        DeliveredDetailsVo vo = new DeliveredDetailsVo();
+        ResultBean<AppDeliveredDetailsVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData();
+        AppDeliveredDetailsVo appDeliveredApplyInfoVo = resultBean.getData();
         BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
         return rb.success().setData(vo);
     }
@@ -277,20 +277,14 @@ public class AppBusDeliveredApplyService {
         List<ConfigVo> modelInfo = new ArrayList<>();
         List<List<ConfigVo>> handCarInfo = new ArrayList<>();
         String vinNo = traliveredVo.getVinNo();
-        if (StringUtils.isNotBlank(vinNo)) {
-            modelInfo.add(getConfigValueSpanSize("车型信息", "", 2));
-            modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 1));
-        }
+        modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 2));
         String modelName = traliveredVo.getModelName();
-        if (StringUtils.isNotBlank(modelName)) {
-            modelInfo.add(getConfigValueSpanSize("车型", modelName, 1));
-        }
-        deliveredTralierVo.setModelInfo(modelInfo);
+        modelInfo.add(getConfigValueSpanSize("车型", modelName, 2));
+        deliveredTralierVo.setModeInfo(modelInfo);
         List<TrailerVo> list = traliveredVo.getList();
         for (int i = 0; i < list.size(); i++) {
             TrailerVo trailerVo = list.get(i);
             List<ConfigVo> configVoList = new ArrayList<>();
-            configVoList.add(getConfigValueSpanSize("挂车" + i + 1, "", 2));
             //挂车车架号
             String trailerVinNo = trailerVo.getTrailerVinNo();
             configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1));
@@ -315,20 +309,28 @@ public class AppBusDeliveredApplyService {
             String appearanceSizeLong = trailerVo.getAppearanceSizeLong();
             if (StringUtils.isNotBlank(appearanceSizeLong)) {
                 appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "长      mm,";
             }
             String appearanceSizeWide = trailerVo.getAppearanceSizeWide();
             if (StringUtils.isNotBlank(appearanceSizeWide)) {
                 appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "宽      mm,";
             }
             //高
             String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh();
             if (StringUtils.isNotBlank(appearanceSizeHigh)) {
                 appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "高      mm,";
             }
             //总高
             String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh();
             if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) {
-                appearanceSizeAll = appearanceSizeAll + "总高 " + "mm";
+                appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh+"mm";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "总高     mm";
             }
             //外观尺寸
             configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2));
@@ -336,21 +338,21 @@ public class AppBusDeliveredApplyService {
             String insideSizeAll = "";
             String insideSizeLong = trailerVo.getInsideSizeLong();
             if (StringUtils.isNotBlank(insideSizeLong)) {
-                insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm";
+                insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,";
             } else {
-                insideSizeAll = insideSizeAll + "长  mm";
+                insideSizeAll = insideSizeAll + "长      mm,";
             }
             String insideSizeWide = trailerVo.getInsideSizeWide();
             if (StringUtils.isNotBlank(insideSizeWide)) {
-                insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm";
+                insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,";
             } else {
-                insideSizeAll = insideSizeAll + "宽  mm";
+                insideSizeAll = insideSizeAll + "宽      mm,";
             }
             String insideSizeHigh = trailerVo.getInsideSizeHigh();
             if (StringUtils.isNotBlank(insideSizeHigh)) {
                 insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm";
             } else {
-                insideSizeAll = insideSizeAll + "高  mm";
+                insideSizeAll = insideSizeAll + "高      mm";
             }
             configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2));
             String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh();
@@ -359,15 +361,21 @@ public class AppBusDeliveredApplyService {
             String girderSizeAll = "";
             String girderSizeHigh = trailerVo.getGirderSizeHigh();
             if (StringUtils.isNotBlank(girderSizeHigh)) {
-                girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm";
+                girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,";
+            }else{
+                girderSizeAll = girderSizeAll + "高度     mm,";
             }
             String girderSizeWide = trailerVo.getGirderSizeWide();
             if (StringUtils.isNotBlank(girderSizeWide)) {
-                girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm";
+                girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,";
+            }else{
+                girderSizeAll = girderSizeAll + "宽度     mm,";
             }
             String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate();
             if (StringUtils.isNotBlank(girderSizeStandPlate)) {
                 girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm";
+            }else{
+                girderSizeAll = girderSizeAll + "立板     mm";
             }
             configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2));
             //牵引销
@@ -384,13 +392,18 @@ public class AppBusDeliveredApplyService {
             configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2));
             //底板
             String floorSize = trailerVo.getFloorSize();
-            configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
+            if(StringUtils.isNotBlank(floorSize)){
+                configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
+            }else{
+                configVoList.add(getConfigValueSpanSize("底板(底盘)",  "        mm", 2));
+            }
+
             //门扇要求
             String doorFanRequirement = trailerVo.getDoorFanRequirement();
             configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1));
             //箱体颜色
             String boxColor = trailerVo.getBoxColor();
-            configVoList.add(getConfigValueSpanSize("门扇要求", boxColor, 1));
+            configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1));
             //更多配置
             String moreConfig = trailerVo.getMoreConfig();
             configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2));

doc/databases/bus-center_tables.sql

@@ -245,16 +245,15 @@ CREATE TABLE `bus_delivered_apply`
     `staffUserSid`        varchar(64)          DEFAULT NULL COMMENT '销售专员用户sid',
     `staffName`           varchar(64)          DEFAULT NULL COMMENT '销售专员名称',
     `staffDeptSid`        varchar(64)          DEFAULT NULL COMMENT '销售部门sid',
-    `staffDeptName`       varchar(64)          DEFAULT NULL COMMENT '销售部门',
+    `staffDeptName`       varchar(500)         DEFAULT NULL COMMENT '销售部门',
     `loanName`            varchar(64)          DEFAULT NULL COMMENT '贷款人',
     `loanMobile`          varchar(64)          DEFAULT NULL COMMENT '贷款人手机号',
     `distributorName`     VARCHAR(200)         DEFAULT NULL COMMENT '返利人1',
     `distributorPrice`    VARCHAR(200)         DEFAULT NULL COMMENT '返利金额1',
     `distributorNameTwo`  VARCHAR(200)         DEFAULT NULL COMMENT '返利人2',
     `distributorPriceTwo` VARCHAR(200)         DEFAULT NULL COMMENT '返利金额2',
-    `price`               varchar(64)          DEFAULT NULL COMMENT '成交价',
+    `price`               varchar(200)         DEFAULT NULL COMMENT '成交价',
     `orgSidPath`          varchar(500)         DEFAULT NULL COMMENT 'orgSidPath',
-
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -280,7 +279,7 @@ CREATE TABLE `bus_delivered_apply_details`
     `vinSid`                 varchar(64)          DEFAULT NULL COMMENT '车辆sid',
     `useMessageSid`          VARCHAR(64)          DEFAULT NULL COMMENT '使用人信息sid',
     `singleCarDiscountPrice` VARCHAR(200)         DEFAULT NULL COMMENT '销售折让',
-    `discountAll`            VARCHAR(200)         DEFAULT NULL COMMENT '赠送套餐',
+    `discountAll`            VARCHAR(500)         DEFAULT NULL COMMENT '赠送套餐',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -329,14 +328,14 @@ CREATE TABLE `bus_delivered_use_message`
     `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `name`               varchar(64)          DEFAULT NULL COMMENT '客户名称',
-    `mobile`             VARCHAR(64)          DEFAULT NULL COMMENT '联系电话',
+    `mobile`             VARCHAR(200)         DEFAULT NULL COMMENT '联系电话',
     `idNo`               VARCHAR(200)         DEFAULT NULL COMMENT '证件号码',
     `address`            VARCHAR(200)         DEFAULT NULL COMMENT '联系地址',
     `applySid`           VARCHAR(64)          DEFAULT NULL COMMENT '出库申请sid',
     `isConfirmRealBuyer` VARCHAR(64)          DEFAULT NULL COMMENT '是否确定实际购车人',
     `customerTypeKey`    VARCHAR(64)          DEFAULT NULL COMMENT '客户类型',
     `customerType`       VARCHAR(64)          DEFAULT NULL COMMENT '客户类型',
-    `contacts`           VARCHAR(64)          DEFAULT NULL COMMENT '联系人',
+    `contacts`           VARCHAR(200)         DEFAULT NULL COMMENT '联系人',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB