车辆出库详情

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java

@@ -89,7 +89,7 @@ public interface BaseMiddlemanFeign {
     ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(@Valid @RequestBody PagerQuery<BaseMiddleQuery> query);
 
     @ApiOperation("车辆出库中介人员")
-    @PostMapping("/selectMiddleList")
+    @GetMapping("/selectMiddleList")
     @ResponseBody
     ResultBean<List<BaseMiddleListVo>> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 16:45
+ * @Description
+ */
+@Data
+public class BaseVehicleOutDetailsVo implements Vo {
+    private static final long serialVersionUID = -7699189616162991308L;
+
+    private String vinSid;
+    private String vinNo;
+    @ApiModelProperty("出库类型")
+    private String type;
+    private String typeKey;
+    @ApiModelProperty("销售部门sid")
+    private String orgSid;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员sid")
+    private String staffSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("合同编号")
+    private String concatNo;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("是否为终端客户:1是0不是")
+    private String isTerminal;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("赠品说明")
+    private String giftsDescription;
+
+    @ApiModelProperty("销售折让")
+    private String salesAllowance;
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+    @ApiModelProperty("中介人1sid")
+    private String middleOneSid;
+    @ApiModelProperty("返利金额1")
+    private String rebateMoneyOne;
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+    @ApiModelProperty("中介人2sid")
+    private String middleTwoSid;
+    @ApiModelProperty("返利金额2")
+    private String rebateMoneyTwo;
+    @ApiModelProperty("备注")
+    private String remarks;
+    private String saleDate;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -5,9 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author dimengzhe
@@ -30,6 +28,13 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/pagerList")
     @ResponseBody
     ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(@RequestBody PagerQuery<BaseVehicleOutQuery> query);
+
+    @ApiOperation("出库详情")
+    @GetMapping("/details/{sid}")
+    @ResponseBody
+    ResultBean<BaseVehicleOutDetailsVo> details(@PathVariable("sid") String sid);
+
+
 }
 
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java

@@ -13,6 +13,9 @@ import lombok.Data;
 public class BaseVehicleOutVo implements Vo {
     private static final long serialVersionUID = -1711615769602118459L;
 
+    @ApiModelProperty("sid")
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vinSid;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@@ -47,4 +47,7 @@ public class BusVehicleApplyDetail extends BaseEntity {
     private String insideCode;
     @ApiModelProperty(value = "厂家合同价")
     private Integer contractPrice;
+
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@@ -52,4 +52,6 @@ public class BusVehicleApplyDetailDto implements Dto {
     private String contractPrice;
 
     private BusVehicleApplySzDto busVehicleApplySz;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@@ -55,4 +55,6 @@ public class BusVehicleApplyDetailVo implements Vo {
 
     @ApiModelProperty(value = "上装指导价")
     private Integer guidePrice;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
 
 
     IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
+
+    BaseVehicleOutDetailsVo details(String sid);
 }

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

@@ -42,10 +42,40 @@
                bvo.middleOne,
                bvo.middleTwo,
                bvo.rebateMoneyOne,
-               bvo.rebateMoneyTwo
+               bvo.rebateMoneyTwo,
+               bv.configName           as modelConfig,
+               bvo.sid
         from base_vehicle_out bvo
+                 left join base_vehicle bv on bv.sid = bvo.vinSid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
+        select vinSid,
+               vinNo,
+               type,
+               typeKey,
+               orgSid,
+               orgName,
+               staffName,
+               staffSid,
+               concatNo,
+               price,
+               case isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+               customerName,
+               customerSid,
+               mobile,
+               giftsDescription,
+               salesAllowance,
+               middleOne,
+               middleTwo,
+               rebateMoneyOne,
+               rebateMoneyTwo,
+               remarks,
+               saleDate
+        from base_vehicle_out
+        where sid = #{sid}
+    </select>
 </mapper>

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

@@ -1,9 +1,6 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -36,4 +33,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         PagerVo<BaseVehicleOutVo> pv = baseVehicleOutService.pagerList(query);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
+        return baseVehicleOutService.details(sid);
+    }
 }

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

@@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -99,4 +96,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
+        ResultBean<BaseVehicleOutDetailsVo> rb = ResultBean.fireFail();
+        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid);
+        return rb.success().setData(baseVehicleOutDetailsVo);
+    }
 }