Browse Source

销售订单-移动端车型信息

zhanglei
dimengzhe 3 years ago
parent
commit
a8f533cbe7
  1. 31
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java
  2. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java
  3. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java
  4. 62
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java
  5. 57
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
  6. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java
  7. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
  8. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java
  9. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarVo.java
  10. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

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

@ -0,0 +1,31 @@
package com.yxt.anrui.base.api.busvehicleapplydetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/5/28 16:53
* @Description
*/
@Data
public class AppBusVehicleApplyListVo implements Vo {
private static final long serialVersionUID = -505102275598551605L;
@ApiModelProperty(value = "采购订单编号")
private String orderId;
@ApiModelProperty(value = "创建日期")
private String date;
@ApiModelProperty(value = "总数")
private String totalNum;
@ApiModelProperty(value = "可使用数量")
private String canUseNum;
@ApiModelProperty(value = "选择数量")
private String selectNum;
@ApiModelProperty(value = "采购订单sid")
private String sid;
@ApiModelProperty(value = "提示信息")
private String msg;
@ApiModelProperty(value = "锁定数量")
private String lockingNum;
}

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

@ -8,10 +8,9 @@ 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;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
@ -28,8 +27,8 @@ import org.springframework.web.bind.annotation.RequestBody;
*/
@Api(tags = "车辆排产申请_车型列表")
@FeignClient(
contextId = "anrui-scm-BusVehicleApplyDetail",
name = "anrui-scm",
contextId = "anrui-base-BusVehicleApplyDetail",
name = "anrui-base",
path = "v1/busvehicleapplydetail",
fallback = BusVehicleApplyDetailFeignFallback.class)
public interface BusVehicleApplyDetailFeign {
@ -65,4 +64,9 @@ public interface BusVehicleApplyDetailFeign {
@ApiOperation("销售订单-采购订单数量")
@GetMapping("/selectOrderCount")
ResultBean<Integer> selectOrderCount(@SpringQueryMap BusVehicleOrderCountQuery busVehicleOrderCountQuery);
@ApiOperation("app销售订单-采购订单列表")
@GetMapping("/getAppApplyList")
ResultBean<List<AppBusVehicleApplyListVo>> getAppApplyList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid);
}

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

@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: BusVehicleApplyDetailFeignFallback.java <br/>
@ -62,4 +64,10 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail
public ResultBean<Integer> selectOrderCount(BusVehicleOrderCountQuery busVehicleOrderCountQuery) {
return null;
}
@Override
public ResultBean<List<AppBusVehicleApplyListVo>> getAppApplyList(String modelSid, String configSid) {
return null;
}
}

62
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java

@ -6,6 +6,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.busvehicleapply.BusVehicleApply;
import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo;
@ -33,36 +34,47 @@ import java.util.List;
@Mapper
public interface BusVehicleApplyDetailMapper extends BaseMapper<BusVehicleApplyDetail> {
//@Update("update bus_vehicle_apply_detail set name=#{msg} where id=#{id}")
//IPage<BusVehicleApplyDetailVo> voPage(IPage<BusVehicleApplyDetail> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleApplyDetail> qw);
IPage<BusVehicleApplyDetailVo> selectPageVo(IPage<BusVehicleApplyDetail> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleApplyDetail> qw);
List<BusVehicleApplyDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusVehicleApplyDetail> qw);
@Select("select * from bus_vehicle_apply_detail")
List<BusVehicleApplyDetailVo> selectListVo();
//@Update("update bus_vehicle_apply_detail set name=#{msg} where id=#{id}")
//IPage<BusVehicleApplyDetailVo> voPage(IPage<BusVehicleApplyDetail> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleApplyDetail> qw);
IPage<BusVehicleApplyDetailVo> selectPageVo(IPage<BusVehicleApplyDetail> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleApplyDetail> qw);
List<BusVehicleApplyDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusVehicleApplyDetail> qw);
@Select("select * from bus_vehicle_apply_detail")
List<BusVehicleApplyDetailVo> selectListVo();
BusVehicleApplyDetailVo selModel(@Param("sid") String sid);
@Delete("DELETE FROM bus_vehicle_apply_detail WHERE applySid = #{sid}")
void delByApplySid(String sid);
@Delete("DELETE FROM bus_vehicle_apply_detail WHERE applySid = #{sid}")
void delByApplySid(String sid);
@Select("select * from bus_vehicle_apply_detail where applySid = #{sid}")
List<BusVehicleApplyDetailVo> fetchByApplySid(String sid);
@Select("select * from bus_vehicle_apply_detail where applySid = #{sid}")
List<BusVehicleApplyDetailVo> fetchByApplySid(String sid);
/**
* 销售订单-采购订单分页列表
* @param page 分页
* @param qw 查询条件
* @return
*/
IPage<BusVehicleApplyListVo> applyPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER)QueryWrapper<BusVehicleApply> qw);
/**
* 销售订单-采购订单分页列表
*
* @param page 分页
* @param qw 查询条件
* @return
*/
IPage<BusVehicleApplyListVo> applyPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleApply> qw);
/**
* 根据车型sid及配置sid查询采购订单的数量
* @param qw 查询条件
* @return
*/
/**
* 根据车型sid及配置sid查询采购订单的数量
*
* @param qw 查询条件
* @return
*/
List<OrderListVo> selectOrderCount(@Param(Constants.WRAPPER) QueryWrapper<BusVehicleApply> qw);
/**
* 根据车型及配置查询采购订单列表
*
* @param modelSid 车型sid
* @param configSid 配置sid
* @return
*/
List<AppBusVehicleApplyListVo> getAppApplyList(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
}

57
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@ -4,20 +4,28 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo">
SELECT
bvad.applySid,
bvad.vehicleSid,bvad.vehicleName,
bvad.configSid, bvad.actualQuantity
, bvad.state , bvad.saleGuPrice,
bva.brand
FROM bus_vehicle_apply_detail bvad
left join bus_vehicle_apply bva on bvad.applySid=bva.sid
<where>${ew.sqlSegment}</where>
SELECT bvad.applySid,
bvad.vehicleSid,
bvad.vehicleName,
bvad.configSid,
bvad.actualQuantity
,
bvad.state,
bvad.saleGuPrice,
bva.brand
FROM bus_vehicle_apply_detail bvad
left join bus_vehicle_apply bva on bvad.applySid = bva.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo">
SELECT * FROM bus_vehicle_apply_detail
<where>${ew.sqlSegment}</where>
SELECT *
FROM bus_vehicle_apply_detail
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selModel" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo">
select *
@ -26,16 +34,27 @@
</select>
<select id="applyPage" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo">
select bo.sid linkSid,bo.orderNo linkNo,bo.orderDate linkText,bo.platformNo,bo.lockingNum from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv on bd.applySid = bv.sid
left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
${ew.customSqlSegment}
select bo.sid linkSid, bo.orderNo linkNo, bo.orderDate linkText, bo.platformNo, bo.lockingNum
from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv on bd.applySid = bv.sid
left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
${ew.customSqlSegment}
</select>
<select id="selectOrderCount" resultType="com.yxt.anrui.base.api.busvehicleorder.OrderListVo">
select bo.platformNo,bo.lockingNum from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv on bd.applySid = bv.sid
left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
${ew.customSqlSegment}
select bo.platformNo, bo.lockingNum
from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv on bd.applySid = bv.sid
left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
${ew.customSqlSegment}
</select>
<select id="getAppApplyList" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo">
select bo.sid, bo.orderNo orderId, bo.orderDate date, bo.platformNo as totalNum, bo.lockingNum
from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv on bd.applySid = bv.sid
left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
where bd.vehicleSid = #{modelSid}
and bd.configSid = #{configSid}
</select>
</mapper>

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java

@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: BusVehicleApplyDetailFeignFallback.java <br/>
@ -59,7 +61,7 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
busVehicleApplyDetailService.delBySids(sids);
return rb.success();
@ -89,6 +91,7 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
/**
* 根据车型sid及配置sid查询采购订单数量
*
* @param busVehicleOrderCountQuery 查询条件
* @return
*/
@ -97,5 +100,10 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
return busVehicleApplyDetailService.selectOrderCount(busVehicleOrderCountQuery);
}
@Override
public ResultBean<List<AppBusVehicleApplyListVo>> getAppApplyList(String modelSid, String configSid) {
return busVehicleApplyDetailService.getAppApplyList(modelSid, configSid);
}
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@ -15,6 +15,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -187,9 +188,9 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
int count = 0;
int plat = 0;
int locking = 0;
if(orderListVoList.size() != 0){
if (orderListVoList.size() != 0) {
for (int i = 0; i < orderListVoList.size(); i++) {
if(orderListVoList.get(i) != null){
if (orderListVoList.get(i) != null) {
String platformNo = orderListVoList.get(i).getPlatformNo();
String lockingNum = orderListVoList.get(i).getLockingNum();
if (StringUtils.isNotBlank(platformNo)) {
@ -198,11 +199,20 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
locking = Integer.parseInt(lockingNum);
}
}
count = count+(plat-locking);
count = count + (plat - locking);
}
}
}
return rb.success().setData(count);
}
public ResultBean<List<AppBusVehicleApplyListVo>> getAppApplyList(String modelSid, String configSid) {
ResultBean<List<AppBusVehicleApplyListVo>> rb = ResultBean.fireFail();
List<AppBusVehicleApplyListVo> voList = baseMapper.getAppApplyList(modelSid, configSid);
if(voList.isEmpty()){
return rb.setData(new ArrayList<>());
}
return rb.success().setData(voList);
}
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java

@ -14,6 +14,6 @@ public class AppCarInfo implements Vo {
private List<AppNowCarVo> nowCar;
@ApiModelProperty("销售订单-车型确认-排产")
private List<AppReadyCar> readyCar;
private List<AppReadyCarVo> readyCar;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarVo.java

@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppReadyCar implements Vo {
public class AppReadyCarVo implements Vo {
private static final long serialVersionUID = -6797740135964430331L;
@ApiModelProperty("排产订单编号")

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

@ -39,7 +39,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar;
import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
@ -175,6 +176,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BusVehicleApplyDetailFeign busVehicleApplyDetailFeign;
/**
* 构造查询条件
@ -1315,7 +1318,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
orderInfo.setReadyCarList(appReadyCarList);
vo.setOrderInfo(orderInfo);
AppCarInfo carInfo = new AppCarInfo();
List<AppReadyCar> readyCars = new ArrayList<>();
List<AppReadyCarVo> readyCars = new ArrayList<>();
carInfo.setReadyCar(readyCars);
List<AppNowCarVo> nowCars = new ArrayList<>();
carInfo.setNowCar(nowCars);
@ -1336,7 +1339,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
AppCarInfo appCarInfo = new AppCarInfo();
//根据车型及配置查询除的现车列表
List<AppNowCarVo> appNowCars = new ArrayList<>();
List<AppReadyCar> appReadyCar = new ArrayList<>();
List<AppReadyCarVo> appReadyCar = new ArrayList<>();
List<AppNowCarList> appNowCarLists = new ArrayList<>();
List<AppReadyCarList> appReadyCarLists = new ArrayList<>();
//根据车型及配置查询车型信息
@ -1363,11 +1366,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
appCarInfo.setNowCar(appNowCars);
}
//排产采购订单
List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid,configSid);
if(applyListResultBean.getSuccess()){
List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData();
for (AppBusVehicleApplyListVo applyListVo : applyListVos){
AppReadyCarVo appReadyCarVo = new AppReadyCarVo();
BeanUtil.copyProperties(applyListVo,appReadyCarVo);
appReadyCar.add(appReadyCarVo);
}
appCarInfo.setReadyCar(appReadyCar);
}
vo.setCarInfo(appCarInfo);
/*List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
//排产
BeanUtil.copyProperties(appReadyCar, appOrderReadyCars);
vo.setCarInfo(appCarInfo);
appCarInfo.setReadyCar(appReadyCar);
appCarInfo.setReadyCar(appReadyCar);*/
return vo;
}

Loading…
Cancel
Save