修改付款申请选择车辆、付款申请获取厂家销售通路

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-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,
         <!--银行账号-->
@@ -56,15 +55,15 @@
         bmb.remarks
         FROM base_manufacturer_bank bmb
         WHERE bmb.manufacturerSid = #{sid}
-        AND bmb.isDelete = 0
+          AND bmb.isDelete = 0
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bmb.bankAccount num, bmb.accountName name
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
-                     left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
-                     left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
+                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
           and bmb.dueBankKey = '2'
     </select>
@@ -74,14 +73,28 @@
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           AND bm.useOrg = #{useOrgSid}
           and bmb.dueBankKey = #{code}
     </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

@@ -2644,7 +2644,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
     public ResultBean updateVehRemarks(String remarks, String sid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.updateVehRemarks(remarks,sid);
+        baseMapper.updateVehRemarks(remarks, sid);
         return rb.success().setMsg("备注修改成功");
     }
 
@@ -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());
+            }
+            //系列
+            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.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         }
+        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/basevehicleout/BaseVehicleOutService.java

@@ -58,16 +58,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
-        if(StringUtils.isNotBlank(dto.getPrice())){
+        if (StringUtils.isNotBlank(dto.getPrice())) {
             baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
         }
-        if(StringUtils.isNotBlank(dto.getSalesAllowance())){
+        if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
             baseVehicleOut.setSalesAllowance(new BigDecimal(dto.getSalesAllowance()));
         }
-        if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
+        if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
             baseVehicleOut.setRebateMoneyOne(new BigDecimal(dto.getRebateMoneyOne()));
         }
-        if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
+        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
             baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
         }
         baseMapper.insert(baseVehicleOut);
@@ -78,14 +78,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
         baseVehicle.setSalesDate(new Date());
-        if(StringUtils.isNotBlank(dto.getPrice())){
+        if (StringUtils.isNotBlank(dto.getPrice())) {
             baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
         }
         baseVehicleService.updateById(baseVehicle);
         ////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 +94,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());
@@ -120,18 +120,36 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //业务员
 
         //中介单位
+        salOutStock.setF_PAEZ_Base(dto.getMiddleOne());
 
         //物料列表
         List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
 
         SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
         //单价
+        fEntity.setFPrice(dto.getPrice());
         //物料编码
         //批号
         //仓库id
         //销售折让
+        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);