yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化销售订单退车流程，如果订单所有车都退了，销售订单作废

master
fanzongzhe 2 years ago
parent
7e63b427c4
commit
7d540d4cba
9 changed files with 133 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
  2. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
  4. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
  6. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  7. 57
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  8. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  9. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
View File

@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
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.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@ -23,4 +25,9 @@ public interface BaseVehicleStateFeign {
@PostMapping("saveOrUpdate")
ResultBean saveOrUpdate(@RequestBody List<BaseVehicleStateDto> dto);
@PostMapping("selectOneByBusSid")
@ResponseBody
ResultBean<BaseVehicleState> selectOneByBusSid(@RequestParam("busSid") String busSid);
}

25
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -416,11 +416,15 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
} else {
variables.put("isAdj", isAdj);
}
if (StringUtils.isNotBlank(baseOutsourcingApplication.getSaleOrderSid())){
if (StringUtils.isNotBlank(baseOutsourcingApplication.getSaleOrderSid())) {
variables.put("isSend", true);
}else {
} else {
variables.put("isSend", false);
}
String purchasingUnitName = baseOutsourcingApplication.getPurchasingUnitName();
String purchaseSystemName = baseOutsourcingApplication.getPurchaseSystemName();
String orderNames = purchaseSystemName + purchasingUnitName + "外采申请";
variables.put("orderNames", orderNames);
//=================添加app参数结束
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
@ -488,11 +492,16 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
} else {
variables.put("isAdj", isAdj);
}
if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
if (StringUtils.isNotBlank(booad.getSaleOrderSid())) {
variables.put("isSend", true);
}else {
} else {
variables.put("isSend", false);
}
BaseOutsourcingApplication entity = fetchBySid(businessSid);
String purchasingUnitName = entity.getPurchasingUnitName();
String purchaseSystemName = entity.getPurchaseSystemName();
String orderNames = purchaseSystemName + purchasingUnitName + "外采申请";
variables.put("orderNames", orderNames);
//=================添加app参数结束
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
@ -604,9 +613,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
} else {
bv.getFormVariables().put("isAdj", isAdj);
}
if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
if (StringUtils.isNotBlank(booad.getSaleOrderSid())) {
appMap.put("isSend", true);
}else {
} else {
appMap.put("isSend", false);
}
bv.getFormVariables().put("app", appMap);
@ -943,9 +952,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
} else {
map.put("isAdj", isAdj);
}
if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
if (StringUtils.isNotBlank(booad.getSaleOrderSid())) {
map.put("isSend", true);
}else {
} else {
map.put("isSend", false);
}
bv.setFormVariables(map);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
* @description:
@ -15,4 +17,6 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
BaseVehicleState selectOnes(String busSid);
BusSalesOrder selevtByBusSid(String busSid);
BaseVehicleState selectOneByBusSid(String busSid);
}

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
View File

@ -4,12 +4,23 @@
<select id="selectOnes" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
select *
from base_vehicle_state
where busSid = #{busSid} and busState != '602' order by id desc limit 1
where busSid = #{busSid}
and busState != '602'
order by id desc limit 1
</select>
<select id="selevtByBusSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
select bo.* from anrui_buscenter.bus_sales_order bo
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
select bo.*
from anrui_buscenter.bus_sales_order bo
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
where bv.sid = #{busSid}
</select>
<select id="selectOneByBusSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
SELECT *
FROM base_vehicle_state
WHERE remarks = '退车'
AND busState = '602'
AND busSid = #{busSid}
</select>
</mapper>

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.base.biz.basevehiclestate;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.common.core.result.ResultBean;
@ -28,4 +29,11 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
public ResultBean saveOrUpdate(List<BaseVehicleStateDto> dto) {
return baseVehicleStateService.saveOrUpdateState(dto);
}
@Override
public ResultBean<BaseVehicleState> selectOneByBusSid(String busSid) {
return baseVehicleStateService.selectOneByBusSid(busSid);
}
}

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -151,4 +151,16 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
return rb.success();
}
/**
* 查询退车状态
* @param busSid
* @return
*/
public ResultBean<BaseVehicleState> selectOneByBusSid(String busSid) {
ResultBean<BaseVehicleState> rb = ResultBean.fireFail();
BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSid(busSid);
return rb.success().setData(baseVehicleState);
}
}

57
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -36,9 +36,14 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
@ -51,8 +56,10 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeQuery;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
@ -137,6 +144,10 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
private FileUploadComponent fileUploadComponent;
@Resource
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BusSalesOrderVehicleService busSalesOrderVehicleService;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
BusSalesOrderReturnVehApplyQuery query = pq.getParams();
@ -559,10 +570,56 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(businessSid);
//---------------------修改车辆持久状态-------------------------
String orderSid = busSalesOrderReturnVehApply.getOrderSid();
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<BusSalesOrderVehicle> vehicleList = new ArrayList<>();
BusSalesOrder finalBusSalesOrderOne = busSalesOrderService.fetchBySid(orderSid);
//---------------------修改车辆持久状态-------------------------
for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid();
baseVehicleFeign.updateLockedState(vehSid);
//------------------------修改车辆持久状态--------------------------
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vehSid, orderSid);
vehicleList.add(busSalesOrderVehicle);
//------------------------修改车辆持久状态--------------------------
}
//------------------------修改车辆持久状态--------------------------
vehicleList.removeAll(Collections.singleton(null));
if (!vehicleList.isEmpty()) {
vehicleList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.TC.getTypeKey());
if (StringUtils.isNotBlank(v.getLinkSid())) {
baseVehicleStateDto.setVinSid(v.getLinkSid());
baseVehicleStateDto.setVinNo(v.getLinkNo());
}
baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
baseVehicleStateDto.setBusSid(v.getSid());
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
//判断销售订单是否全部退车
List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid);
vinList.removeAll(Collections.singleton(null));
List<BaseVehicleState> stateList = new ArrayList<>();
if (!vinList.isEmpty()) {
for (BusSalesOrderVehicle busSalesOrderVehicle : vinList) {
String busSalesOrderVehicleSid = busSalesOrderVehicle.getSid();
BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneByBusSid(busSalesOrderVehicleSid).getData();
if (null != baseVehicleState) {
stateList.add(baseVehicleState);
}
}
if (stateList.size() == vinList.size()) {
BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
salesOrder.setNodeState("作废");
busSalesOrderService.updateById(salesOrder);
}
}
//------------------------修改车辆持久状态--------------------------
}
return rb.success().setData(resultBean.getData());
} else {

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
View File

@ -114,6 +114,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo);
List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
@ -135,4 +136,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
List<String> selectByVinSidAndContractNo(@Param("list") List<String> vinSidList, @Param("contractNo") String contractId);
List<String> selectListByvinNo(@Param("vinNo") String vinNo);
@Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{orderSid}")
BusSalesOrderVehicle selectOneByVehSidAndOrderSid(@Param("vehSid") String vehSid, @Param("orderSid") String orderSid);
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -500,4 +500,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
List<String> sids = baseMapper.selectListByvinNo(vinNo);
return rb.success().setData(sids);
}
/**
* 通过vehSid查询
* @param vehSid
* @return
*/
public BusSalesOrderVehicle selectOneByVehSidAndOrderSid(String vehSid,String orderSid) {
return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid);
}
}
Write Preview
Loading…
Cancel
Save