Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.scm.api.scmvehicleactualdetails;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/9 11:35
+ * @Description 未售买断已选择的车辆列表
+ */
+@Data
+public class ScmVehicleActualDetailsVo implements Vo {
+    private static final long serialVersionUID = -281646013506665817L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty(value = "车型名称")
+    private String modelName;
+    @ApiModelProperty(value = "入库日期")
+    private Date inboundDate;
+    @ApiModelProperty(value = "入库价")
+    private String inboundPrice;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesDetailsVo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.api.scmvehicleactualsales;
+
+import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/9 11:28
+ * @Description
+ */
+@Data
+public class ScmVehicleActualSalesDetailsVo implements Vo {
+    private static final long serialVersionUID = -3110309934818922020L;
+    @ApiModelProperty(value = "未售买断sid")
+    private String sid;
+    @ApiModelProperty(value = "申请人")
+    private String applicationName;
+    @ApiModelProperty(value = "申请日期")
+    private String createTime;
+    @ApiModelProperty(value = "买断原因")
+    private String reason;
+    @ApiModelProperty(value = "车辆列表")
+    private List<ScmVehicleActualDetailsVo> voList = new ArrayList<>();
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java

@@ -5,14 +5,12 @@ 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
  * @Date 2022/4/8 11:57
- * @Description
+ * @Description 未售买断管理
  */
 @FeignClient(
         contextId = "anrui-scm-ScmVehicleActualSales",
@@ -36,5 +34,11 @@ public interface ScmVehicleActualSalesFeign {
     @ResponseBody
     ResultBean submitVehicleSales(@RequestBody ScmVehicleActualSalesDto scmVehicleActualSalesDto);
 
+    @ApiOperation("初始化")
+    @GetMapping("/details")
+    @ResponseBody
+    ResultBean<ScmVehicleActualSalesDetailsVo> details(@RequestParam(value = "sid") String sid,
+                                                       @RequestParam(value = "name") String name);
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
  * @Description
  */
 @Component
-public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSalesFeign{
+public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSalesFeign {
     @Override
     public ResultBean<PagerVo<ScmVehicleActualSalesVo>> listPage(PagerQuery<ScmVehicleActualSalesQuery> pagerQuery) {
         return null;
@@ -26,4 +26,9 @@ public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSales
     public ResultBean submitVehicleSales(ScmVehicleActualSalesDto scmVehicleActualSalesDto) {
         return null;
     }
+
+    @Override
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
+        return null;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehicleactualdetails;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails;
+import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -13,8 +14,16 @@ import java.util.List;
  */
 @Mapper
 public interface ScmVehicleActualDetailsMapper extends BaseMapper<ScmVehicleActualDetails> {
-    
+
     List<ScmVehicleActualDetails> selectBySaleSid(String sid);
 
     int deleteBySaleSid(String sid);
+
+    /**
+     * 已选择的车辆列表
+     *
+     * @param sid 未售买断sid
+     * @return
+     */
+    List<ScmVehicleActualDetailsVo> detailsList(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.xml

@@ -12,4 +12,10 @@
         from scm_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </delete>
+
+    <select id="detailsList" resultType="com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo">
+        select sid, vinNo, modelName, DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate, inboundPrice
+        from scm_vehicle_actual_details
+        where vehicleActualSid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehicleactualdetails;
 
 import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails;
 import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsDto;
+import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -55,4 +56,14 @@ public class ScmVehicleActualDetailsService extends MybatisBaseService<ScmVehicl
         baseMapper.deleteBySaleSid(sid);
         saveDetails(detailsList, sid);
     }
+
+    /**
+     * 已选择的车辆列表
+     *
+     * @param sid
+     * @return
+     */
+    public List<ScmVehicleActualDetailsVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.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.scm.api.scmvehicleactualsales.ScmVehicleActualSales;
+import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDetailsVo;
 import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,5 +24,13 @@ public interface ScmVehicleActualSalesMapper extends BaseMapper<ScmVehicleActual
      * @param qw   查询条件
      * @return
      */
-    IPage<ScmVehicleActualSalesVo> pagerList(IPage<ScmVehicleActualSalesVo> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleActualSalesVo> qw);
+    IPage<ScmVehicleActualSalesVo> pagerList(IPage<?> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleActualSales> qw);
+
+    /**
+     * 初始化
+     *
+     * @param sid 车辆未售买断sid
+     * @return
+     */
+    ScmVehicleActualSalesDetailsVo details(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.xml

@@ -4,10 +4,16 @@
     <select id="pagerList" resultType="com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo">
         select sv.sid,
                sv.applicationName,
-               sv.createTime,
+               DATE_FORMAT(sv.createTime, '%Y-%m-%d')                                                  as createTime,
                sv.reason,
                (select count(*) from scm_vehicle_actual_details sa where sa.vehicleActualSid = sv.sid) as num
         from scm_vehicle_actual_sales sv
             ${ew.customSqlSegment}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDetailsVo">
+        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName
+        from scm_vehicle_actual_sales
+        where sid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.scm.biz.scmvehicleactualsales;
 
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDto;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesFeign;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesQuery;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo;
+import com.yxt.anrui.scm.api.scmvehicleactualsales.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -25,7 +22,6 @@ public class ScmVehicleActualSalesRest implements ScmVehicleActualSalesFeign {
     @Autowired
     private ScmVehicleActualSalesService scmVehicleActualSalesService;
 
-
     @Override
     public ResultBean<PagerVo<ScmVehicleActualSalesVo>> listPage(PagerQuery<ScmVehicleActualSalesQuery> pagerQuery) {
         ResultBean<PagerVo<ScmVehicleActualSalesVo>> rb = ResultBean.fireFail();
@@ -42,4 +38,9 @@ public class ScmVehicleActualSalesRest implements ScmVehicleActualSalesFeign {
     public ResultBean submitVehicleSales(ScmVehicleActualSalesDto scmVehicleActualSalesDto) {
         return scmVehicleActualSalesService.submitVehicleSales(scmVehicleActualSalesDto);
     }
+
+    @Override
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
+        return scmVehicleActualSalesService.details(sid, name);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.scm.biz.scmvehicleactualsales;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
@@ -7,10 +8,8 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSales;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDto;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesQuery;
-import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo;
+import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo;
+import com.yxt.anrui.scm.api.scmvehicleactualsales.*;
 import com.yxt.anrui.scm.biz.scmvehicleactualdetails.ScmVehicleActualDetailsService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -70,13 +69,13 @@ public class ScmVehicleActualSalesService extends MybatisBaseService<ScmVehicleA
     }
 
     private IPage<ScmVehicleActualSalesVo> pagerList(PagerQuery<ScmVehicleActualSalesQuery> pagerQuery) {
-        IPage<ScmVehicleActualSalesVo> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<ScmVehicleActualSalesVo> qw = buildQueryWrapper(pagerQuery.getParams());
+        IPage<?> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<ScmVehicleActualSales> qw = buildQueryWrapper(pagerQuery.getParams());
         return baseMapper.pagerList(page, qw);
     }
 
-    private QueryWrapper<ScmVehicleActualSalesVo> buildQueryWrapper(ScmVehicleActualSalesQuery params) {
-        QueryWrapper<ScmVehicleActualSalesVo> qw = new QueryWrapper<>();
+    private QueryWrapper<ScmVehicleActualSales> buildQueryWrapper(ScmVehicleActualSalesQuery params) {
+        QueryWrapper<ScmVehicleActualSales> qw = new QueryWrapper<>();
         if (params != null) {
             //申请日期
             //状态
@@ -152,4 +151,25 @@ public class ScmVehicleActualSalesService extends MybatisBaseService<ScmVehicleA
     public ResultBean submitVehicleSales(ScmVehicleActualSalesDto scmVehicleActualSalesDto) {
         return null;
     }
+
+    /**
+     * 初始化
+     *
+     * @param sid 未售买断sid
+     * @return
+     */
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
+        ResultBean<ScmVehicleActualSalesDetailsVo> rb = ResultBean.fireFail();
+        ScmVehicleActualSales scmVehicleActualSales = fetchBySid(sid);
+        ScmVehicleActualSalesDetailsVo vo = new ScmVehicleActualSalesDetailsVo();
+        if (scmVehicleActualSales == null) {
+            //申请日期即为当天
+            vo.setCreateTime(DateUtil.today());
+            vo.setApplicationName(name);
+        } else {
+            vo = baseMapper.details(sid);
+            List<ScmVehicleActualDetailsVo> voList = scmVehicleActualDetailsService.detailsList(sid);
+        }
+        return rb.success().setData(vo);
+    }
 }