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

修改验车和入库推送车辆台账接口

zhanglei
hp 3 years ago
parent
a8f30567fe
commit
c39129a431
14 changed files with 152 additions and 61 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. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  2. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  4. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  5. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  6. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
  7. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  8. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
  9. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  10. 40
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  11. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  12. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java
  13. 80
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  14. 34
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
View File

@ -72,7 +72,7 @@ public class BaseVehicleDto implements Dto {
private String location;
@ApiModelProperty("存放地点名称（陕汽必须的字段）")
private String locationName;
@ApiModelProperty(value = "厂家入库价")
@ApiModelProperty(value = "厂家结算价")
private Integer costPrice;
@ApiModelProperty(value = "厂家合同价")
private Integer contractPrice;

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -46,6 +46,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -399,8 +400,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
scmEntryVehicleExamineDto.setModelName(booad.getVehicleAlias());
scmEntryVehicleExamineDto.setModelSid(booad.getVehicleSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey("03");
scmEntryVehicleExamineDto.setPurchaseType("排产");
scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.TC_ORDER.getCode());
scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.TC_ORDER.getRemarks());
scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
scmEntryVehicleExamineDto.setVinNo(booad.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");

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

@ -43,6 +43,7 @@ import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
@ -456,8 +457,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
scmEntryVehicleExamineDto.setModelName(booad.getModelName());
scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey("03");
scmEntryVehicleExamineDto.setPurchaseType("排产");
scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode());
scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());
scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
scmEntryVehicleExamineDto.setVinNo(baseOutsourcingApplicationVehicleVo.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -1724,6 +1724,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (null == baseVehicle)
return rb.success().setMsg("参数错误");
if (null == baseVehicle.getId()){
return rb.success().setMsg("无需更新");
}
if (!updateById(baseVehicle)) {
return rb.setMsg("更新车辆台账据失败");
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -4,8 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
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.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery;
import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
import com.yxt.anrui.base.api.basevehicleactualsales.*;
import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery;
@ -294,9 +297,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//更新车辆的结算状态为预买断
//结算状态设置为预买断
String settlementStatus = VehicleState.BuyoutEnum.PRE_BUYOUT.getCode();
List<BaseVehicleActualDetailsDto> detailsList = dto.getDetailsList();
for (BaseVehicleActualDetailsDto f : detailsList){
BaseVehicle baseVehicle = new BaseVehicle();
baseVehicle.setVinNo(f.getVinNo());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode());
baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
/* String settlementStatus = VehicleState.BuyoutEnum.PRE_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks();
updateByVinNo(bv.getBusinessSid(), settlementStatus, settlementStatusValue);
updateByVinNo(bv.getBusinessSid(), settlementStatus, settlementStatusValue);*/
return voResultBean;
}
if (r == 2) {

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
View File

@ -74,6 +74,8 @@ public class BusDeliveredApply extends BaseEntity {
private String mobile;
@ApiModelProperty(value = "创建人sid")
private String createBySid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty(value = "节点状态")
private String nodeState;
@ApiModelProperty(value = "节点id")

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
View File

@ -186,6 +186,12 @@ public interface BusDeliveredApplyFeign {
@ResponseBody
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
@ApiOperation("手机端-出库申请 详情")
@GetMapping("/getRetrievalDetail/{contractSid}")
@ResponseBody
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(@PathVariable("contractSid") String contractSid);
@ApiOperation("手机端-保存 出库申请")
@PostMapping("/saveRetrievalApplyInfo")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
View File

@ -145,6 +145,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
return null;
}
@Override
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
return null;
}
@Override
public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
return null;

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
View File

@ -215,6 +215,13 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
return rb.success().setData(retrievalApplyInfo.getData());
}
@Override
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
ResultBean rb = ResultBean.fireFail();
ResultBean<AppDeliveredApplyInfoVo> appDeliveredApplyInfoVo = busDeliveredApplyService.getRetrievalDetail(contractSid);
return rb.success().setData(appDeliveredApplyInfoVo.getData());
}
@Override
public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
return busDeliveredApplyService.saveRetrievalApplyInfo(appDeliveredApplyDto);

40
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -60,6 +60,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -787,4 +788,43 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
return rb.success().setData(vo);
}
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
BusDeliveredApply busDeliveredApply = fetchBySid(contractSid);
BeanUtils.copyProperties(busDeliveredApply,vo);
if (vo.getIsTerminal().equals(1)) {
List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
voList.removeAll(Collections.singleton(null));
if (!voList.isEmpty()) {
for (AppCarListVo v : voList) {
CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
appUseInfoVo.setMobile(data.getMobile());
appUseInfoVo.setCustomer(data.getName());
appUseInfoVo.setAddress(data.getAddress());
appUseInfoVo.setIdNumber(data.getIDNumber());
v.setUseInfo(appUseInfoVo);
}
}
vo.setCarList(voList);
} else if (vo.getIsTerminal().equals(0)) {
//根据出库申请单的sid查询需要出库的车辆信息
List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
for (int i = 0; i < voList.size(); i++) {
BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress());
appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo());
voList.get(i).setUseInfo(appUseInfoVo);
}
vo.setCarList(voList);
}
return rb.success().setData(vo);
}
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -426,8 +427,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
scmEntryVehicleExamineDto.setModelName(booad.getModelName());
scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey("03");
scmEntryVehicleExamineDto.setPurchaseType("排产");
scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");
@ -464,6 +465,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
baseVehicleDtos.add(baseVehicleDto);
}
baseVehicleFeign.saveOrUpdate(baseVehicleDtos,OperVehicleState.EventType.RZ_SAVEVEH.getCode());
// 入账审批通关修改采购订单状态 state = 1
busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
}
return rb.success().setData(resultBean.getData());

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java
View File

@ -135,7 +135,7 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
}
@Override
@ApiOperation("手机端-保存验车单")
@ApiOperation("手机端-保存入库单")
@PostMapping("/saveCarWarehousingInfo")
public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) {
return scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto);

80
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
View File

@ -27,11 +27,14 @@ package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.VehicleEnterlibrary;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -290,32 +293,57 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
scmFileService.save(scmFile1);
}
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(dto.getVin());
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicleDto.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicleDto.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
baseVehicleDto.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
baseVehicleDto.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
baseVehicleDto.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid
baseVehicleDto.setLocationName(dto.getWarehouse());//库存地点
baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate()); //入库日期
baseVehicleFeign.save(baseVehicleDto);
//排产
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid
baseVehicleDto.setLocationName(dto.getWarehouse());//库存地点
List<BaseVehicleDto> list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
}
//外采
if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin());
baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
baseVehicleDto.setContractPrice(0); // 待确定
baseVehicleDto.setCostPrice(0);// 待确定
baseVehicleDto.setOrderingNo(""); // 采购编号
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid
baseVehicleDto.setLocationName(dto.getWarehouse());//库存地点
baseVehicleDto.setWarrantyCardNo("");// 保修卡号 验车
baseVehicleDto.setSpecialInstructions(""); // 特殊差异说明 验车
List<BaseVehicleDto> list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());
}
if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())){
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin());
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
List<BaseVehicleDto> list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.TC_SAVEVEH.getCode());
}
return rb.success().setMsg("操作成功！");
} else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {
return rb.fail().setMsg("当前车辆已入库，请勿重复保存");

34
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -50,6 +51,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.collections.list.AbstractLinkedList;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -474,14 +476,16 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
baseMapper.updateById(scmVehicleExamine);
// 通过验车 并保存入库单
AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto();
//车架号
carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo());
carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType());
carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey());
carWarehousingDto.setModelName(scmVehicleExamine.getModelName());
carWarehousingDto.setModelSid(scmVehicleExamine.getModelSid());
carWarehousingDto.setConfigSid(scmVehicleExamine.getConfigSid());
carWarehousingDto.setConfigName(scmVehicleExamine.getConfigName());
carWarehousingDto.setVehicleSid(scmVehicleExamine.getVehicleSid());
//订单类型
carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType());
carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey());
carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate());
carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate());
carWarehousingDto.setInspection(scmVehicleExamine.getInspection());
@ -493,31 +497,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(dto.getVin());
String userSid = dto.getUserSid();
ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
String data2 = pathSidByUserSid.getData();
baseVehicleDto.setCreateOrgSid(data2);
baseVehicleDto.setUseOrgSid(data2);
baseVehicleDto.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicleDto.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicleDto.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
baseVehicleDto.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
baseVehicleDto.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
baseVehicleDto.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
baseVehicleDto.setModelSid(scmVehicleExamine.getModelSid()); //车型sid
baseVehicleDto.setModelName(scmVehicleExamine.getModelName());//车型名称
baseVehicleDto.setConfigName(scmVehicleExamine.getConfigName());//配置名称
baseVehicleDto.setModelConfigSid(scmVehicleExamine.getConfigSid());//配置sid
baseVehicleDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo());//保修卡卡号
baseVehicleDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain());//特殊配置差异说明
baseVehicleFeign.save(baseVehicleDto);
List<BaseVehicleDto> list = new ArrayList();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1);
List<String> factoryImage = dto.getFactoryImage();

Write Preview
Loading…
Cancel
Save