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

优化销售订单办理添加采购渠道

zhanglei
dimengzhe 2 years ago
parent
1e5a462b42
commit
de9bd04f04
1 changed files with 32 additions and 29 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. 61
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

61
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -244,8 +244,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private BusSalesOrderDepositService busSalesOrderDepositService;
@Autowired
private BusDepositFictitiousService busDepositFictitiousService;
/* @Autowired
private BusPurchaseChannelService busPurchaseChannelService;*/
/* @Autowired
private BusPurchaseChannelService busPurchaseChannelService;*/
@Autowired
private ScmPurchaseChannelFeign scmPurchaseChannelFeign;
@Autowired
@ -1315,7 +1315,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) {
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
@ -2407,9 +2407,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
}else{
} else {
//类型为现车，查询该销售订单的现车车辆信息
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
nowCarList.removeAll(Collections.singleton(null));
@ -3478,7 +3478,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
String topMessage = "";
if(busSalesOrderMakeup != null){
if (busSalesOrderMakeup != null) {
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
@ -5160,11 +5160,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
//更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
if (!list.isEmpty()) {
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
@ -5237,24 +5237,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//-----------------推送车款款项结束
//推送采购渠道待选择
/* ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
scmPurchaseChannelFeign.save(scmPurchaseChannelDto);*/
if ("3".equals(busSalesOrder.getType())) {
ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
scmPurchaseChannelFeign.save(scmPurchaseChannelDto);
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -6617,12 +6620,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
newSalesOrder.setContractNo(null);
newSalesOrder.setCreateTime(createTime);
newSalesOrder.setModifyTime(modifyTime);
if(StringUtils.isNotBlank(customerSid)){
if (StringUtils.isNotBlank(customerSid)) {
newSalesOrder.setCustomerSid(customerSid);
newSalesOrder.setCustomerName(customerName);
newSalesOrder.setMobile(customerMobile);
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
if(crmCustomerTempVoResultBean.getData() != null){
if (crmCustomerTempVoResultBean.getData() != null) {
newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
}
@ -6888,7 +6891,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.fetchBySid(baseVehicleTempstate.getBusSid());
//根据合同和车辆查询该合同下是否还存在未提车的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), baseVehicleTempstate.getVehSid());
if(busSalesOrderVehicle != null){
if (busSalesOrderVehicle != null) {
stringList.add(busSalesOrderVehicle.getSid());
}

Write Preview
Loading…
Cancel
Save