|
|
|
@ -30,6 +30,8 @@ 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.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.VehicleEnterlibrary; |
|
|
|
@ -90,6 +92,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle |
|
|
|
@Autowired |
|
|
|
FileUploadComponent fileUploadComponent; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign; |
|
|
|
|
|
|
|
private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
@ -273,6 +278,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle |
|
|
|
scmVehicleEnterlibrary.setAddressCode(dto.getLocation()); |
|
|
|
scmVehicleEnterlibrary.setInboundState("2"); |
|
|
|
scmVehicleEnterlibrary.setLocation(dto.getWarehouse()); |
|
|
|
scmVehicleEnterlibrary.setLocationSid(dto.getWarehouseKey()); |
|
|
|
scmVehicleEnterlibrary.setStorekeeper(data.getStaffName()); |
|
|
|
baseMapper.updateById(scmVehicleEnterlibrary); |
|
|
|
VehicleEnterlibrary vehicleEnterlibrary = new VehicleEnterlibrary(); |
|
|
|
@ -293,7 +299,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle |
|
|
|
scmFileService.save(scmFile1); |
|
|
|
} |
|
|
|
//车辆台账推送数据
|
|
|
|
|
|
|
|
String businessSid = scmVehicleEnterlibrary.getBusinessSid(); |
|
|
|
//排产
|
|
|
|
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { |
|
|
|
BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); |
|
|
|
@ -316,24 +322,25 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle |
|
|
|
baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
|
|
|
|
baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
|
|
|
|
baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
|
|
|
|
baseVehicleDto.setContractPrice(0); // 待确定
|
|
|
|
baseVehicleDto.setCostPrice(0);// 待确定
|
|
|
|
baseVehicleDto.setOrderingNo(""); // 采购编号
|
|
|
|
BaseOutsourcingApplicationDetailsVo applicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(businessSid).getData(); |
|
|
|
baseVehicleDto.setContractPrice(Integer.valueOf(applicationDetailsVo.getManufactorSettlementPrice())); // 厂家合同价
|
|
|
|
baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
|
|
|
|
baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
|
|
|
|
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(""); // 特殊差异说明 验车
|
|
|
|
baseVehicleDto.setLocation(scmVehicleEnterlibrary.getLocationSid()); //库存地点sid
|
|
|
|
baseVehicleDto.setLocationName(scmVehicleEnterlibrary.getLocation());//库存地点
|
|
|
|
baseVehicleDto.setWarrantyCardNo(scmVehicleEnterlibrary.getWarrantyCardNo());// 保修卡号 验车
|
|
|
|
baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
|
|
|
|
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())){ |
|
|
|
if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { |
|
|
|
BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); |
|
|
|
baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin()); |
|
|
|
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); |
|
|
|
|
yxt_djz
3 years ago