Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.basemanufacturerbank;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/9 10:11
+ * @Description
+ */
+@Data
+public class BaseManPayQuery implements Query {
+    private static final long serialVersionUID = 1674811728094269348L;
+
+    private String useOrgSid;
+
+
+}

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

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

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

@@ -4,6 +4,7 @@ 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.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,4 +52,8 @@ public interface BaseManufacturerBankFeign {
     @ApiOperation("未售买断获取厂家销售通路")
     @GetMapping("/actualList/{useOrgSid}")
     ResultBean<List<BaseManActualVo>> actualList(@PathVariable("useOrgSid") String useOrgSid);
+
+    @ApiOperation("付款申请获取厂家销售通路")
+    @GetMapping("/payList")
+    ResultBean<List<BaseManPayVo>> payList(@SpringQueryMap BaseManPayQuery query);
 }

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

@@ -35,4 +35,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
     public ResultBean<List<BaseManActualVo>> actualList(String useOrgSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<BaseManPayVo>> payList(BaseManPayQuery query) {
+        return null;
+    }
 }

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

@@ -16,12 +16,34 @@ import java.util.List;
 public class PayBaseVehicleQuery implements Query {
     private static final long serialVersionUID = 8939482367294270164L;
 
-    @ApiModelProperty(value = "已选择的车辆的sid")
-    private List<String> sidList = new ArrayList<>();
+    @ApiModelProperty(value = "品牌")
+    private String brandSid;
+    @ApiModelProperty(value = "功能")
+    private String vehicleType;
+    @ApiModelProperty(value = "系列")
+    private String productLine;
+    @ApiModelProperty(value = "变速箱")
+    private String gearboxType;
+    @ApiModelProperty(value = "驱动")
+    private String driveForm;
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandard;
+    @ApiModelProperty(value = "马力")
+    private String power;
+    @ApiModelProperty(value = "燃料")
+    private String fuelType;
+    @ApiModelProperty(value = "版本")
+    private String vehicleVersion;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "快捷检索车型")
+    private String modelName;
 
-    @ApiModelProperty(value = "车架号")
-    private String vinNo;
+    @ApiModelProperty(value = "已选择的车辆的sid")
+    private List<String> vinSidList = new ArrayList<>();
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "orgSid")
+    private String orgSid;
 }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +14,46 @@ import lombok.Data;
 @Data
 public class PayBaseVehicleVo implements Vo {
     private static final long serialVersionUID = 8935506131970564858L;
-
-    @ApiModelProperty("车型名称")
-    private String modelName;
-    @ApiModelProperty("车型sid")
+    private String sid;
+    @ApiModelProperty(value = "品牌")
+    private String brandName;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车型sid")
     private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("车辆sid")
-    private String vehSid;
-    @ApiModelProperty("车架号")
+    @ApiModelProperty(value = "车架号")
     private String vinNo;
-    @ApiModelProperty("厂家结算价")
-    private String costPrice;
+    @ApiModelProperty(value = "颜色")
+    private String color;
+    @ApiModelProperty(value = "存放地点")
+    private String location;
+    @ApiModelProperty(value = "存放地点sid")
+    private String locationSid;
+    @ApiModelProperty(value = "销售指导价")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guidedPrice;
+
+    @ApiModelProperty(value = "常用配置")
+    private String configName;
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
+    @ApiModelProperty(value = "入库日期")
+    private String priceDate;
+
+    @ApiModelProperty(value = "入库价：厂家结算价")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String priced;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("排放标准")
+    private String emissionStandardValue;
 }

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

@@ -92,6 +92,11 @@ public interface CommonAppendixFeign {
     public ResultBean<AppCommonAppendixVo> getAppAppendix(@RequestParam("linkSid") String linkSid,
                                                           @RequestParam(value = "attachType", required = false) String attachType);
 
+    @ApiOperation("手机端查询多个附件")
+    @GetMapping("/getAppAppendixList")
+    public ResultBean<List<CommonAppendixVo>> getAppAppendixList(@RequestParam("linkSid") String linkSid,
+                                                                    @RequestParam(value = "attachType", required = false) String attachType);
+
     @ApiOperation("手机端查询担保人文件附件")
     @GetMapping("/getAppGuarantorList")
     public ResultBean<List<AppCommonAppendixVo>> getAppGuarantorList(@RequestParam("linkSid") String linkSid);

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

@@ -101,6 +101,11 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
 		return rb.setMsg("接口anrui-base/commonappendix/getAppAppendix无法访问");
 	}
 
+	@Override
+	public ResultBean<List<CommonAppendixVo>> getAppAppendixList(String linkSid, String attachType) {
+		return null;
+	}
+
 	@Override
 	public ResultBean getAppGuarantorList(String linkSid) {
 		ResultBean rb = ResultBean.fireFail();

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

@@ -44,6 +44,9 @@ public enum CommonAttachTypeEnum {
     INVOICE_KPXXQRS("0003_3", "开票信息确认书"),
     WITNESS("0004", "跟进记录的材料"),
     ADVANCE_GIN("0005", "提前开票附件"),
+    ADVANCE_KHKPSQS("0005_1", "客户开票申请书"),
+    ADVANCE_CLDJHT("0005_2", "车辆登记合同"),
+    ADVANCE_KPXXQRS("0005_3", "开票信息确认书"),
     CUSTOMER_FILE("0006", "客户资料附件"),
     ARREARS("0007", "欠款提车附件"),
     SCENESIGN("0008", "现场签署附件"),

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

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basemanufacturerbank;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
@@ -64,4 +65,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     List<BaseManActualVo> actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
 
     List<BusApplyVo> selectBankByApplySid(String createOrgSid);
+
+    List<BaseManPayVo> payList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
 }

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

@@ -30,8 +30,7 @@
 
     <!--根据供应厂商sid查询开户行信息-->
     <select id="selectDetails" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
-        SELECT
-        bmb.sid,
+        SELECT bmb.sid,
         <!--账户名称-->
         bmb.accountName,
         <!--银行账号-->
@@ -81,7 +80,21 @@
     </select>
 
     <select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
-        select bm.manufacturerCode code,bmb.bankAccount num,bmb.accountName name from base_manufacturer bm left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
-        where bm.createOrg = #{createOrgSid} and dueBankValue = '订金账户'
+        select bm.manufacturerCode code, bmb.bankAccount num, bmb.accountName name
+        from base_manufacturer bm
+                 left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
+        where bm.createOrg = #{createOrgSid}
+          and dueBankValue = '订金账户'
+    </select>
+
+    <select id="payList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo">
+        select bmb.accountName,
+               bmb.depositBank,
+               bmb.bankAccount
+        from base_manufacturer_bank bmb
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+        where bmb.isDelete = 0
+          AND bm.useOrg = #{useOrgSid}
+          and bmb.dueBankKey = #{code}
     </select>
 </mapper>

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

@@ -83,5 +83,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
         return rb.success().setData(voList);
     }
 
+    @Override
+    public ResultBean<List<BaseManPayVo>> payList(BaseManPayQuery query) {
+        ResultBean<List<BaseManPayVo>> rb = ResultBean.fireFail();
+        List<BaseManPayVo> voList = baseManufacturerBankService.payList(query);
+        return rb.success().setData(voList);
+    }
+
 
 }

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

@@ -1,9 +1,8 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.*;
 import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
@@ -77,4 +76,10 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public List<BusApplyVo> selectBankByApplySid(String createOrgSid) {
         return baseMapper.selectBankByApplySid(createOrgSid);
     }
+
+    public List<BaseManPayVo> payList(BaseManPayQuery query) {
+        String useOrgSid = query.getUseOrgSid();
+        String code = DictCommonEnum.dueBank.HK_TYPE.getCode();
+        return baseMapper.payList(useOrgSid,code);
+    }
 }

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

@@ -1184,7 +1184,36 @@
     </select>
 
     <select id="selectPayVehicleList" resultType="com.yxt.anrui.base.api.basevehicle.PayBaseVehicleVo">
-        select bv.vinNo,bv.modelName,bv.modelSid,bv.modelConfigSid configSid,bv.sid vehSid,bv.costPrice from base_vehicle bv
+        SELECT bv.sid,
+        <!--品牌名称-->
+        bvm.brandName,
+        <!--车型名称-->
+        bvm.vehicleAlias,
+        <!--车型sid-->
+        bvm.sid as modelSid,
+        <!--车架号-->
+        bv.vinNo,
+        <!--颜色-->
+        bmc.carColor color,
+        <!--存放地点-->
+        bv.locationName location,
+        <!--存放地点sid-->
+        bv.location locationSid,
+        <!--销售指导价 取值厂家结算价 -->
+        bv.costPrice as guidedPrice,
+        bmc.configName,
+        bmc.sid as configSid,
+        DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
+        bv.costPrice as priced,
+        bv.insideCode,
+        (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum,
+        bvm.vehicleVersionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        bvm.emissionStandardValue
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -2655,17 +2655,61 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         //本分公司、非删除、库存状态为非在途非调入。
         if (query != null) {
             if (StringUtils.isNotBlank(query.getUserSid())) {
-                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
-                qw.eq("bv.useOrgSid", resultBean.getData());
+                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+                qw.eq("bv.createOrgSid", orgSid);
+
             }
-            if (query.getSidList().size() > 0) {
-                qw.notIn("bv.vinNo", query.getSidList());
+            //品牌
+            if (StringUtils.isNotBlank(query.getBrandSid())) {
+                qw.eq("bvm.carBrand", query.getBrandSid());
             }
-            if (StringUtils.isNotBlank(query.getVinNo())) {
-                qw.like("bv.vinNo", query.getVinNo());
+            //功能
+            if (StringUtils.isNotBlank(query.getVehicleType())) {
+                qw.eq("bvm.vehicleType", query.getVehicleType());
             }
-            qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+            //系列
+            if (StringUtils.isNotBlank(query.getProductLine())) {
+                qw.eq("bvm.productLine", query.getProductLine());
+            }
+            //变速箱
+            if (StringUtils.isNotBlank(query.getGearboxType())) {
+                qw.eq("bvm.gearboxType", query.getGearboxType());
+            }
+            //驱动
+            if (StringUtils.isNotBlank(query.getDriveForm())) {
+                qw.eq("bvm.driveForm", query.getDriveForm());
             }
+            //排放标准
+            if (StringUtils.isNotBlank(query.getEmissionStandard())) {
+                qw.eq("bvm.emissionStandard", query.getEmissionStandard());
+            }
+            //马力
+            if (StringUtils.isNotBlank(query.getPower())) {
+                qw.eq("bvm.power", query.getPower());
+            }
+            //燃料
+            if (StringUtils.isNotBlank(query.getFuelType())) {
+                qw.eq("bvm.fuelType", query.getFuelType());
+            }
+            //版本
+            if (StringUtils.isNotBlank(query.getVehicleVersion())) {
+                qw.eq("bvm.vehicleVersion", query.getVehicleVersion());
+            }
+            //车型
+            if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+                qw.like("bvm.vehicleAlias", query.getVehicleAlias());
+            }
+            //快捷检索车型
+            if (StringUtils.isNotBlank(query.getModelName())) {
+                qw.like("bvm.modelName", query.getModelName());
+            }
+            if (query.getVinSidList().size() > 0) {
+                qw.notIn("bv.sid", query.getVinSidList());
+            }
+        }
+        qw.eq("bv.isDelete", 0);
+        qw.eq("bv.isProblemVeh", 0);
+        qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw);
         PagerVo<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java

@@ -127,4 +127,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper<BaseVehicleBrand> {
 
     @Select("SELECT DISTINCT manufacturerSid FROM base_vehicle_brand WHERE useOrg LIKE %#{orgSid}%")
     List<String> selectManSidByOrgSid(String orgSid);
+
+    String selectShortName(String modelSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@@ -112,4 +112,9 @@
         FROM base_vehicle_brand bvb
         where find_in_set(#{useOrg}, bvb.useOrg)
     </select>
+
+    <select id="selectShortName" resultType="java.lang.String">
+        SELECT bb.brandShortName FROM base_vehicle_model bm left join base_vehicle_brand bb on bm.carBrand = bb.sid
+        where bm.sid = #{modelSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -233,4 +233,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
     public List<String> selectManSidByOrgSid(String orgSid) {
         return baseMapper.selectManSidByOrgSid(orgSid);
     }
+
+    public String selectShortName(String modelSid) {
+        return baseMapper.selectShortName(modelSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -11,6 +11,8 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,6 +41,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -85,7 +89,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         ////ToDo:推送财务出库单
         //推送金蝶出库单
         try {
-            SalOutStock salOutStock = createSalOutStock(baseVehicle);
+            SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -94,7 +98,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    private SalOutStock createSalOutStock(BaseVehicle baseVehicle) {
+    private SalOutStock createSalOutStock(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
         SalOutStock salOutStock = new SalOutStock();
         //日期
         salOutStock.setFDate(baseVehicle.getCreateTime().toString());
@@ -116,22 +120,43 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         //项目类别key和项目类别type
-
+        salOutStock.setF_PAEZ_AssistantType(dto.getType());
+        salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
         //业务员
 
         //中介单位
+        salOutStock.setF_PAEZ_Base(dto.getMiddleOne());
 
         //物料列表
         List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
 
         SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
         //单价
+        fEntity.setFPrice(dto.getPrice());
         //物料编码
         //批号
         //仓库id
+        ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
+        fEntity.setFStockID(voResultBean.getData().getWarehouseCode());
         //销售折让
+        if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+            fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
+        }
+
         //返利金额
+        fEntity.setF_PAEZ_Decimal(dto.getRebateMoneyOne());
         //备注
+        if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+            if (StringUtils.isBlank(dto.getRebateMoneyTwo())) {
+                fEntity.setFEntrynote(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
+            } else {
+                fEntity.setFEntrynote(dto.getRebateMoneyOne());
+            }
+        } else {
+            if (StringUtils.isBlank(dto.getRebateMoneyTwo())) {
+                fEntity.setFEntrynote(dto.getRebateMoneyTwo());
+            }
+        }
         fEntityList.add(fEntity);
         if (fEntityList.size() > 0) {
             salOutStock.setFEntity(fEntityList);

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

@@ -161,6 +161,12 @@ public class CommonAppendixRest implements CommonAppendixFeign {
 		return new ResultBean<AppCommonAppendixVo>().success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<List<CommonAppendixVo>> getAppAppendixList(String linkSid, String attachType) {
+		List<CommonAppendixVo> vos = commonAppendixService.getAppAppendixList(linkSid, attachType);
+		return new ResultBean<List<CommonAppendixVo>>().success().setData(vos);
+	}
+
 	@Override
 	public ResultBean<List<AppCommonAppendixVo>> getAppGuarantorList(String linkSid) {
 		return new ResultBean<List<AppCommonAppendixVo>>().success().setData(commonAppendixService.getAppGuarantorList(linkSid));

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

@@ -210,6 +210,12 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
         return appendixVo;
     }
 
+
+    public List<CommonAppendixVo> getAppAppendixList(String linkSid, String attachType) {
+        List<CommonAppendixVo> list = baseMapper.selectByLinkSid(linkSid, attachType);
+        return list;
+    }
+
     /**
      * 手机端查询担保人文件附件
      *

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.commoncontract;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,10 +18,8 @@ import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
-import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.CommonContractEnum;
 import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
@@ -1322,7 +1321,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         map.put("depositTotal", depositTotal);
         map.put("address", address);
         //生成合同编号
-        String contractNo = getApplyCode(dto.getUserSid());
+        String contractNo = getApplyCode(dto.getUserSid(),appOrderModelInfoVo.getModelSid());
         map.put("contractNo", contractNo);
         String url = "";
         try {
@@ -1460,15 +1459,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return rb.success().setData(list);
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String userSid,String modelSid) {
         //获取分公司sid
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
-        String orgCode = resultBean1.getData().getOrgCode();
-        BillNo b = new BillNo();
+//        String orgCode = resultBean1.getData().getOrgCode();
+        String orgCode = resultBean1.getData().getOrgAbbre();
+        //根据车型sid查询品牌简称
+        String brandCode = baseVehicleBrandService.selectShortName(modelSid);
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        String bill = brandCode+orgCode+date;
+       /* BillNo b = new BillNo();
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.XSDD.getBillType());
-        String bill = Rule.getBill(b);
+        String bill = Rule.getBill(b);*/
         int i = baseMapper.selectNum(bill);
         String billNo = Rule.getBillNo(bill, i);
         return billNo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdCarListVo implements Vo {
+    private static final long serialVersionUID = -1495695891564098295L;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppAdvanceInvoiceDto implements Dto {
+    private static final long serialVersionUID = 4381514282343908312L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractNo;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AdCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String otherReasons;
+    @ApiModelProperty("承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonValue;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppAdvanceInvoiceInfoVo implements Vo {
+    private static final long serialVersionUID = 1498350342194981549L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractNo;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AdCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String otherReasons;
+    @ApiModelProperty("承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonValue;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppAdvanceInvoicePageVo implements Vo {
+    private static final long serialVersionUID = 1414719057186977899L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("合同状态")
+    private String contractType;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+
+    @ApiModelProperty("承诺汇款日期")
+    private String returnedMoneyDate;
+
+    @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("数量")
+    private String num;
+
+    @ApiModelProperty("原因")
+    private String otherReasons;
+
+    @ApiModelProperty("创建日期")
+    private String applyDate;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppAdvanceInvoiceQuery implements Query {
+    private static final long serialVersionUID = 7668511398241906995L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称字段 合同编号字段")
+    private String name;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java

@@ -73,4 +73,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     private String advGinReasonValue; // 提前开票原因value
 	@ApiModelProperty("其他原因")
     private String otherReasons; // 其他原因
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 其他原因
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java

@@ -90,4 +90,27 @@ public interface BusAdvanceGinvoiceapplyFeign {
     @PostMapping("/submitAdvanceGinvoiceaapply")
     public ResultBean submitAdvanceGinvoiceaapply(@RequestBody @Valid BusAdvanceGinvoiceapplyDto dto);
 
+    /*************************************************APP提前开票接口***************************************************/
+
+
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getAdvanceInvoiceList")
+    @ResponseBody
+    ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AppAdvanceInvoiceQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化提前开票申请")
+    @GetMapping("/initAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
+    @ApiOperation("移动端-保存提前开票申请")
+    @PostMapping("/saveAdvanceInvoice")
+    @ResponseBody
+    public ResultBean saveAdvanceInvoice(@Valid @RequestBody AppAdvanceInvoiceDto dto);
+
+    @ApiOperation("手机端-删除提前开票")
+    @GetMapping("/deleteAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java

@@ -80,4 +80,24 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AppArrearsCarryVehiclePageVo implements Vo {
+
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("VINNo")
+    private String VINNo;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+
+    @ApiModelProperty("成交价")
+    private BigDecimal dealMoney;
+
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String applyDate;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppArrearsCarryVehicleQuery implements Query {
+    private static final long serialVersionUID = 6131516750203771743L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称 合同编号")
+    private String name;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java

@@ -63,4 +63,7 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     
 	@ApiModelProperty("累计欠款金额")
     private BigDecimal cumulativeArrearsMoney;
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleDto;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleQuery;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleVo;
@@ -71,4 +73,13 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @PostMapping("/saveArrearsAppendix")
     public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);
     
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getArrearsTakeCarList")
+    @ResponseBody
+    ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery);
+
+    @ApiOperation("手机端-删除欠款提车")
+    @GetMapping("/deleteArrearsTakeCar/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +71,15 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 	public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+		return null;
+	}
+
+
+	@Override
+	public ResultBean deleteArrearsTakeCar(String contractSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java

@@ -26,15 +26,14 @@
 package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyDetailsVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo;
 
 import java.util.List;
 
@@ -65,4 +64,6 @@ public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper<BusAdvanceGinv
     List<BusAdvanceGinvoiceapplyVo> selectListVo();
 
     BusAdvanceGinvoiceapplyDetailsVo fetchAllBySid(String sid);
+
+    IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(IPage<AppAdvanceInvoiceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppAdvanceInvoiceQuery> qw, @Param("name") String name);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
         SELECT
         contractNo,
         customerName,
@@ -15,17 +16,19 @@
         applyDate,
         applyName
         FROM
-		bus_advance_ginvoiceapply <where> ${ew.sqlSegment} </where>
+        bus_advance_ginvoiceapply
+        <where>${ew.sqlSegment}</where>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
-		SELECT * FROM bus_advance_ginvoiceapply <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
+        SELECT * FROM bus_advance_ginvoiceapply
+        <where>${ew.sqlSegment}</where>
     </select>
 
     <select id="fetchAllBySid"
             resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyDetailsVo">
-		SELECT
-				contractNo,
+        SELECT contractNo,
                customerName,
                applyDate,
                carModel,
@@ -35,7 +38,21 @@
                advGinReasonValue,
                otherReasons,
                remarks
-		FROM
-				bus_advance_ginvoiceapply
+        FROM bus_advance_ginvoiceapply
+    </select>
+
+    <select id="getAdvanceInvoiceList"
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo">
+        SELECT contractNo,
+               customerName,
+               applyDate,
+               carModel,
+               arrearsMoney,
+               returnedMoneyDate,
+               advGinReasonKey,
+               advGinReasonValue,
+               otherReasons,
+               remarks
+        FROM bus_advance_ginvoiceapply
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java

@@ -25,7 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -98,4 +100,26 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign
     public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
         return busAdvanceGinvoiceapplyService.submitAdvanceGinvoiceaapply(dto);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        IPage<AppAdvanceInvoicePageVo> iPage = busAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery);
+        return rb.success().setData(iPage);
+    }
+
+    @Override
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return busAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        return busAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -28,10 +28,13 @@ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@@ -43,6 +46,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 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.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -50,6 +54,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.nio.pool.NIOConnFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -97,10 +102,12 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         PagerVo<BusAdvanceGinvoiceapply> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
     public List<BusAdvanceGinvoiceapply> listAll(BusAdvanceGinvoiceapplyQuery query) {
         QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
         return baseMapper.selectList(qw);
     }
+
     private QueryWrapper<BusAdvanceGinvoiceapply> createQueryWrapper(BusAdvanceGinvoiceapplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -318,6 +325,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
 
     /**
      * 保存流程业务关联表 数据
+     *
      * @param map
      */
     private void saveSysFormLink(Map<String, String> map) {
@@ -331,4 +339,126 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         sysFormLinkFeign.save(sysFormLinkDto);
     }
 
+    public IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        AppAdvanceInvoiceQuery params = pagerQuery.getParams();
+        QueryWrapper<AppAdvanceInvoiceQuery> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getUserSid())) {
+            qw.eq("createBySid", params.getUserSid());
+        }
+        IPage<AppAdvanceInvoiceQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppAdvanceInvoicePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
+        return iPage;
+    }
+
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppAdvanceInvoiceInfoVo vo = new AppAdvanceInvoiceInfoVo();
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
+        BeanUtil.copyProperties(busAdvanceGinvoiceapply, vo, "sid");
+        List<AdCarListVo> carList = new ArrayList<>();
+        List<BusGinvoiceapplyVehicleDetailsVo> vinList = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid);
+        for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : vinList) {
+            AdCarListVo adCarListVo = new AdCarListVo();
+            adCarListVo.setPrice(vehicleDetailsVo.getDealMoney());
+            adCarListVo.setVin(vehicleDetailsVo.getVinNo());
+            carList.add(adCarListVo);
+        }
+        vo.setCarList(carList);
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        List<String> confirmFile = new ArrayList<>();
+        List<CommonAppendixVo> confirmFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType()).getData();
+        for (CommonAppendixVo file : confirmFiles) {
+            confirmFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setConfirmFile(confirmFile);
+        List<String> applyFile = new ArrayList<>();
+        List<CommonAppendixVo> applyFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType()).getData();
+        for (CommonAppendixVo file : applyFiles) {
+            applyFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setApplyFile(applyFile);
+        List<String> registerFile = new ArrayList<>();
+        List<CommonAppendixVo> registerFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType()).getData();
+        for (CommonAppendixVo file : registerFiles) {
+            registerFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setRegisterFile(registerFile);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        if (StringUtils.isBlank(dto.getContractSid())) {
+            BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply();
+            BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
+            save(busAdvanceGinvoiceapply);
+            List<AdCarListVo> carList = dto.getCarList();
+            for (AdCarListVo adCarListVo : carList) {
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
+                busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
+                busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin());
+                busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice());
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
+            }
+            saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
+        } else {
+            BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
+            BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
+            updateById(busAdvanceGinvoiceapply);
+            busGinvoiceapplyVehicleService.delByAdvGinSid(dto.getContractSid());
+            List<AdCarListVo> carList = dto.getCarList();
+            for (AdCarListVo adCarListVo : carList) {
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
+                busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
+                busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin());
+                busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice());
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
+            }
+            commonAppendixFeign.deleteFiles(dto.getContractSid());
+            saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
+        }
+        return rb.success();
+    }
+
+    public void saveFile(List<String> confirmFile, List<String> applyFile, List<String> registerFile, String sid, String staffSid) {
+        for (String s : confirmFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+        for (String s : applyFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+        for (String s : registerFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+    }
+
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getNodeState())) {
+            return rb.setMsg("该申请已提交，删除失败");
+        }
+        deleteBySid(contractSid);
+        busGinvoiceapplyVehicleService.delByAdvGinSid(contractSid);
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -56,4 +56,7 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
      * @return
      */
     IPage<ArrearsCarryVehicleVo> getArrearsVehicleList(IPage<ArrearsCarryVehicleVo> page, @Param(Constants.WRAPPER) Wrapper<ArrearsCarryVehicleQuery> qw);
+
+    IPage<AppArrearsCarryVehiclePageVo> getAdvanceInvoiceList(IPage<AppArrearsCarryVehicleQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppArrearsCarryVehicleQuery> qw, @Param("name") String name);
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -54,4 +54,8 @@
         </where>
         ORDER BY bo.contractNo desc
     </select>
+    <select id="getAdvanceInvoiceList"
+            resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo">
+
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
 import com.yxt.common.base.utils.PagerUtil;
@@ -150,5 +152,17 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.saveArrearsAppendix(list);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        IPage<AppArrearsCarryVehiclePageVo> iPage = busArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
+        return rb.success().setData(iPage);
+    }
+
+    @Override
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
@@ -372,4 +374,26 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         return rb.success();
     }
+
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getNodeState())) {
+            return rb.setMsg("该申请已提交，删除失败");
+        }
+        deleteBySid(contractSid);
+        busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(contractSid);
+        return rb.success();
+    }
+
+    public IPage<AppArrearsCarryVehiclePageVo> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+        AppArrearsCarryVehicleQuery params = pagerQuery.getParams();
+        QueryWrapper<AppArrearsCarryVehicleQuery> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getUserSid())) {
+            qw.eq("createBySid", params.getUserSid());
+        }
+        IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
+        return iPage;
+    }
 }

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

@@ -35,6 +35,8 @@
             resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
         SELECT *
         FROM bus_delivered bd
+        WHERE
+        bd.`state` = 1
         group by bd.contractNo
         <where>
             ${ew.sqlSegment}
@@ -45,6 +47,7 @@
         SELECT vinNo as vin
         FROM bus_delivered
         WHERE contractNo = #{contractNo}
+          AND `state` = 1
     </select>
 
     <select id="getDeliveredPice"

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java

@@ -70,4 +70,9 @@ public class FinPaymentapplyVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java

@@ -4,8 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @Author dimengzhe
  * @Date 2022/10/6 22:13
@@ -28,4 +26,6 @@ public class FinPaymentapplyDetailVo implements Vo {
     private String receivingAccount;
     @ApiModelProperty("付款金额")
     private String payAccount;
+
+    private String remarks;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@@ -15,7 +15,9 @@
                case fp.state
                    when 1 then '未付款'
                    when 2 then '已付款' end                         as state,
-               fp.remarks
+               fp.remarks,
+               fp.procInstId,
+               fp.procDefId
         FROM fin_paymentapply fp
         <where>
             ${ew.sqlSegment}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java

@@ -30,6 +30,7 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService<FinPayment
             BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid");
             finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney()));
             bigDecimal = bigDecimal.add(new BigDecimal(dto.getMoney()));
+            finPaymentapplyVehicle.setApplySid(sid);
             baseMapper.insert(finPaymentapplyVehicle);
         }
         return bigDecimal.toString();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SaveListDto implements Dto {
+    private static final long serialVersionUID = -8934344899751306457L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid; // 数据字典sid
+
+    @ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+
+    @ApiModelProperty("List")
+    private List<SysMappingListDto> listDtos;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@@ -80,15 +80,17 @@ public interface SysMappingFeign {
     @ApiOperation("新增映射")
     @PostMapping("/saveMappingList")
     @ResponseBody
-    public ResultBean saveMappingList(@RequestBody List<SysMappingDto> dto);
+    public ResultBean saveMappingList(@RequestBody SaveListDto dto);
 
     @ApiOperation("根据条件查询详情")
     @PostMapping("/selectMappingInfo")
     @ResponseBody
     public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
+
     @PostMapping("/selectMappingListInfo")
     @ResponseBody
-    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid);
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@RequestBody SysMappingListInfoQuery query);
+
     @ApiOperation("根据条件查询详情批量")
     @PostMapping("/selectMappingInfoBatch")
     @ResponseBody

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@@ -72,7 +72,7 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	}
 
 	@Override
-	public ResultBean saveMappingList(List<SysMappingDto> dto) {
+	public ResultBean saveMappingList(SaveListDto dto) {
 		return null;
 	}
 
@@ -82,7 +82,7 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(SysMappingListInfoQuery query) {
 		return null;
 	}
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto <br/>
+ * Description: sys_mapping 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射 数据传输对象", description = "数据映射 数据传输对象")
+public class SysMappingListDto implements Dto {
+
+    private String sid; // sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysMappingListInfoQuery implements Query {
+    private static final long serialVersionUID = 2691844852742909158L;
+
+    @ApiModelProperty("数据字典sid")
+    private String dictSid;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@@ -99,7 +99,7 @@ public class SysMappingRest implements SysMappingFeign {
     }
 
     @Override
-    public ResultBean saveMappingList(List<SysMappingDto> dto) {
+    public ResultBean saveMappingList(SaveListDto dto) {
         ResultBean rb = ResultBean.fireFail();
         sysMappingService.saveMappingList(dto);
         return rb.success();
@@ -113,9 +113,9 @@ public class SysMappingRest implements SysMappingFeign {
     }
 
     @Override
-    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(SysMappingListInfoQuery query) {
         ResultBean<List<SysMappingInfoVo>> rb = ResultBean.fireFail();
-        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
+        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(query.getDictSid());
         return rb.success().setData(vo);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@@ -138,13 +138,15 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
         return vo;
     }
 
-    public void saveMappingList(List<SysMappingDto> dto) {
-        if (dto.size() > 0) {
-            baseMapper.deleteByDictSid(dto.get(0).getDictSid());
-            for (SysMappingDto sysMappingDto : dto) {
+    public void saveMappingList(SaveListDto dto) {
+        if (StringUtils.isNotBlank(dto.getDictSid())) {
+            baseMapper.deleteByDictSid(dto.getDictSid());
+            List<SysMappingListDto> listDtos = dto.getListDtos();
+            for (SysMappingListDto sysMappingDto : listDtos) {
                 SysMapping entity = new SysMapping();
-                BeanUtil.copyProperties(sysMappingDto, entity);
-                entity.setCreateBySid(sysMappingDto.getUserSid());
+                BeanUtil.copyProperties(sysMappingDto, entity, "sid");
+                entity.setDictSid(dto.getDictSid());
+                entity.setCreateBySid(dto.getDictSid());
                 save(entity);
             }
         }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java

@@ -51,6 +51,8 @@ public class ScmVehiclePatrolinspection extends BaseEntity {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
     @ApiModelProperty("月度管理sid")
     private String mainSid; // 车架号
     @ApiModelProperty("存放地点sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -56,6 +56,8 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String sid;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
     @ApiModelProperty("巡检记录sid")
     private String mainSid; // 车架号
     @ApiModelProperty("车型sid")

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

@@ -658,7 +658,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean rb = ResultBean.fireFail();
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos1 = dto.getScmVehicleGressionVehs();
         if (scmVehicleGressionVehDtos1.size() == 0) {
-            return rb.setMsg("请选择车架号！");
+            return rb.setMsg("车辆列表不能为空！");
         }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());

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

@@ -397,7 +397,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
                 scmVehicleInventory.setInventorySid(loginSid);
             }
             scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-            scmVehicleInventory.setCreateOrgSid(loginSid);
+            scmVehicleInventory.setCreateBySid(loginSid);
             scmVehicleInventory.setCreateOrgSid(createOrgSid);
             scmVehicleInventory.setInventoryStateKey(dto.getInventoryStateKey());
             scmVehicleInventory.setInventoryState(dto.getInventoryState());
@@ -443,7 +443,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
                 scmVehicleInventory.setInventorySid(loginSid);
             }
             scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-            scmVehicleInventory.setCreateOrgSid(loginSid);
+            scmVehicleInventory.setCreateBySid(loginSid);
             scmVehicleInventory.setCreateOrgSid(createOrgSid);
             scmVehicleInventory.setInventoryStateKey(dto.getInventoryStateKey());
             scmVehicleInventory.setInventoryState(dto.getInventoryState());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -31,6 +31,7 @@ import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -201,7 +202,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             AppScmVehiclePatrolinspectionsheetInfoVo patrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo();
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.fetchBySid(recordSid);
             patrolinspectionsheetInfoVo.setVin(scmVehiclePatrolinspection.getVinNo());
-            BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(scmVehiclePatrolinspection.getVinNo()).getData();
+            BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehiclePatrolinspection.getVehicleSid()).getData();
             patrolinspectionsheetInfoVo.setModel(data.getModelName());
             patrolinspectionsheetInfoVo.setModelSid(data.getModelSid());
             ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehiclePatrolinspection.getLocationSid());
@@ -273,6 +274,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         Boolean newAdd = dto.getNewAdd();
         if (newAdd) {
+            if (StringUtils.isBlank(dto.getVinNo())) {
+                return rb.setMsg("请选择车架号");
+            }
             List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
             ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
             if (monthVoList.size() > 0) {
@@ -294,12 +298,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             }
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
             scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+            scmVehiclePatrolinspection.setVehicleSid(dto.getVehicleSid());
             scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
             scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
             scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
             scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
             scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
             scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setState(0);
             scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
@@ -310,9 +316,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
             scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
             scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
-            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
-            scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
-            scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+            scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
+            scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
             save(scmVehiclePatrolinspectionsheet);
             scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
@@ -620,9 +625,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             patrolinspectionsheet.setUseOrgSid(useOrgSid);
             patrolinspectionsheet.setCreateOrgSid(useOrgSid);
             patrolinspectionsheet.setCreateBySid(dto.getUserSid());
-            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
-            patrolinspectionsheet.setModel(vehicleVo.getModelName());
-            patrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+//            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
+            patrolinspectionsheet.setModel(dto.getModel());
+            patrolinspectionsheet.setModelSid(dto.getModelSid());
             patrolinspectionsheet.setDutyName(dto.getLiableName());
             patrolinspectionsheet.setDutySid(dto.getLiableSid());
             scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -228,6 +228,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
                 ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
                 scmVehiclePatrolinspection.setVinNo(appScmInventoryRecordsVo.getVin());
+                scmVehiclePatrolinspection.setVehicleSid(appScmInventoryRecordsVo.getSid());
                 scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
                 scmVehiclePatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
                 scmVehiclePatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
@@ -244,6 +245,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspection.setVinNo(inspection.getVin());
                     scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
                     BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
+                    scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid());
                     scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
                     scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
                     scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdvanceInvoiceDto implements Dto {
+    private static final long serialVersionUID = 3374676388152082886L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractId;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private String carList;
+    @ApiModelProperty("欠款金额")
+    private String cumulativeArrearsPrice;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String reasonWrite;
+    @ApiModelProperty("承诺回款日期")
+    private String collectionDate;
+    @ApiModelProperty("车辆登记合同")
+    private String registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonType;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdvanceInvoiceInfoVo implements Vo {
+    private static final long serialVersionUID = 6256861573673134007L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractId;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AppCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String cumulativeArrearsPrice;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String reasonWrite;
+    @ApiModelProperty("承诺回款日期")
+    private String collectionDate;
+    @ApiModelProperty("车辆登记合同")
+    private String registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonType;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdvanceInvoicePageVo implements Vo {
+    private static final long serialVersionUID = -8631337422991366458L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同状态")
+    private String contractType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("承诺汇款日期")
+    private String paymentDate;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @ApiModelProperty("数量")
+    private String number;
+    @ApiModelProperty("原因")
+    private String reason;
+    @ApiModelProperty("创建日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdvanceInvoiceQuery implements Query {
+    private static final long serialVersionUID = -7435351433058437187L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称字段 合同编号字段")
+    private String name;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageQuery;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
+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.*;
+
+import javax.validation.Valid;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeign <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "提前开票申请")
+@FeignClient(
+        contextId = "anrui-terminal-BusAdvanceGinvoiceapply",
+        name = "anrui-terminal",
+        path = "autoservice/v1/advanceInvoice",
+        fallback = BusAdvanceGinvoiceapplyFeignFallback.class)
+public interface AppBusAdvanceGinvoiceapplyFeign {
+
+
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getAdvanceInvoiceList")
+    @ResponseBody
+    ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AdvanceInvoiceQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化提前开票申请")
+    @GetMapping("/initAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
+    @ApiOperation("移动端-保存提前开票申请")
+    @PostMapping("/saveAdvanceInvoice")
+    @ResponseBody
+    public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
+
+    @ApiOperation("手机端-删除提前开票")
+    @GetMapping("/deleteAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+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;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeignFallback <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGinvoiceapplyFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCarListVo implements Vo {
+    private static final long serialVersionUID = -7003788760351399800L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java

@@ -59,6 +59,9 @@ public class PatrolinspectionDto implements Dto {
     @JsonProperty("vin")
     private String vinNo;
 
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
     @ApiModelProperty("车型")
     private String model;
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyRest <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "提前开票申请")
+@RestController()
+@RequestMapping("autoservice/v1/advanceInvoice")
+public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceapplyFeign {
+
+    @Autowired
+    private AppBusAdvanceGinvoiceapplyService appBusAdvanceGinvoiceapplyService;
+
+    @Override
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        return appBusAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoDto;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoVo;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationPageQuery;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationPageVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyService <br/>
+ * Description: 提前开票申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppBusAdvanceGinvoiceapplyService {
+
+    @Autowired
+    BusAdvanceGinvoiceapplyFeign busAdvanceGinvoiceapplyFeign;
+
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        ResultBean<PagerVo<AdvanceInvoicePageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppAdvanceInvoiceQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppAdvanceInvoicePageVo>> advanceInvoiceList = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq);
+        PagerVo<AdvanceInvoicePageVo> vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
+        AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
+        ResultBean<AppAdvanceInvoiceInfoVo> resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(contractSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppAdvanceInvoiceInfoVo appAdvanceInvoiceInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appAdvanceInvoiceInfoVo, vo);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        AppAdvanceInvoiceDto appAdvanceInvoiceDto = new AppAdvanceInvoiceDto();
+        BeanUtil.copyProperties(dto, appAdvanceInvoiceDto);
+        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.saveAdvanceInvoice(appAdvanceInvoiceDto);
+        return resultBean;
+    }
+
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(contractSid);
+        return resultBean;
+    }
+}