|
|
|
@ -6,10 +6,13 @@ import cn.hutool.core.date.DateUnit; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; |
|
|
|
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; |
|
|
|
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem; |
|
|
|
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; |
|
|
|
@ -23,6 +26,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; |
|
|
|
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; |
|
|
|
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; |
|
|
|
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; |
|
|
|
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; |
|
|
|
@ -47,6 +51,14 @@ import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; |
|
|
|
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; |
|
|
|
import com.yxt.anrui.scm.api.scminbound.ScmInboundFeign; |
|
|
|
import com.yxt.anrui.scm.api.scminbounddetail.ScmInboundDetailFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; |
|
|
|
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; |
|
|
|
@ -98,41 +110,34 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehicleService baseVehicleService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private HttpServletResponse response; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehicleModelService baseVehicleModelService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehicleBrandService baseVehicleBrandService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseModelConfigService baseModelConfigService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BusVehicleInquiryService busVehicleInquiryService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehicleCertificateService baseVehicleCertificateService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehmodelConfigService baseVehmodelConfigService; |
|
|
|
@Autowired |
|
|
|
private BaseOutsourcingApplicationService baseOutsourcingApplicationService; |
|
|
|
@Autowired |
|
|
|
private ScmApplyInboundFeign scmApplyInboundFeign; |
|
|
|
@Autowired |
|
|
|
private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign; |
|
|
|
/** |
|
|
|
* 财务模块中的金蝶接口 |
|
|
|
*/ |
|
|
|
@Autowired |
|
|
|
private FinKingDeeFeign finKingDeeFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleTempstateService baseVehicleTempstateService; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseOutsourcingApplicationService baseOutsourcingApplicationService; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private BaseManufacturerService baseManufacturerService; |
|
|
|
@Autowired |
|
|
|
private BaseManufacturerBankService baseManufacturerBankService; |
|
|
|
@ -428,19 +433,120 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode())) |
|
|
|
baseVehicleService.saveVeh_tc(baseVehicle); |
|
|
|
} |
|
|
|
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()) |
|
|
|
|| eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { |
|
|
|
kingdeeStkInStock(dto); |
|
|
|
String cgrkdSid = ""; |
|
|
|
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { |
|
|
|
cgrkdSid = pushRZInBoundQuery(dto); |
|
|
|
} else if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { |
|
|
|
cgrkdSid = pushWCInBoundQuery(dto); |
|
|
|
} |
|
|
|
scmApplyInboundQueryFeign.ctcgykd(cgrkdSid); |
|
|
|
return rb.success().setMsg("保存成功"); |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
* 入库推送业务采购入库单查询 |
|
|
|
* */ |
|
|
|
private String pushRZInBoundQuery(List<BaseVehicleDto> dto) { |
|
|
|
//推送车辆入库查询
|
|
|
|
ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); |
|
|
|
BaseVehicleDto baseVehicleDto = dto.get(0); |
|
|
|
ScmApplyInboundVo scmApplyInboundVo = scmApplyInboundFeign.fetchSid(baseVehicleDto.getInBoundSid()).getData(); |
|
|
|
scmApplyInboundQueryDto.setOrgPriceDate(baseVehicleDto.getOrgPriceDate()); |
|
|
|
scmApplyInboundQueryDto.setManPurOrderTypeKey(baseVehicleDto.getManPurOrderTypeKey()); |
|
|
|
scmApplyInboundQueryDto.setManPurOrderTypeValue(baseVehicleDto.getManPurOrderTypeValue()); |
|
|
|
scmApplyInboundQueryDto.setApplicationCode(scmApplyInboundVo.getApplicationCode()); |
|
|
|
scmApplyInboundQueryDto.setOrgDeptSid(scmApplyInboundVo.getOrgSid()); |
|
|
|
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(scmApplyInboundVo.getOrgSid()).getData(); |
|
|
|
scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); |
|
|
|
scmApplyInboundQueryDto.setPurchaseSystemCode(baseVehicleDto.getOrgCode()); |
|
|
|
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicleDto.getPurchaseSystemSid()).getData(); |
|
|
|
scmApplyInboundQueryDto.setPurchaseSystemName(baseVehicleDto.getPurchaseSystemName()); |
|
|
|
scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
scmApplyInboundQueryDto.setManSid(baseVehicleDto.getSupplierSid()); |
|
|
|
scmApplyInboundQueryDto.setManName(baseVehicleDto.getSupplierName()); |
|
|
|
scmApplyInboundQueryDto.setManCode(baseVehicleDto.getSupplierCode()); |
|
|
|
scmApplyInboundQueryDto.setMakeListSid(scmApplyInboundVo.getApplicationSid()); |
|
|
|
scmApplyInboundQueryDto.setMakeListName(scmApplyInboundVo.getApplicationName()); |
|
|
|
scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); |
|
|
|
scmApplyInboundQueryDto.setCreateOrgSid(scmApplyInboundVo.getUseOrgSid()); |
|
|
|
scmApplyInboundQueryDto.setCreateOrgName(scmApplyInboundVo.getUseOrgName()); |
|
|
|
scmApplyInboundQueryDto.setBusSid(scmApplyInboundVo.getSid()); |
|
|
|
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>(); |
|
|
|
for (BaseVehicleDto baseVehicleDto1 : dto) { |
|
|
|
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); |
|
|
|
scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); |
|
|
|
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); |
|
|
|
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); |
|
|
|
BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData(); |
|
|
|
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType()); |
|
|
|
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); |
|
|
|
scmApplyInboundVehQueryDto.setIunit("辆"); |
|
|
|
scmApplyInboundVehQueryDto.setNum("1"); |
|
|
|
scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice())); |
|
|
|
scmApplyInboundVehQueryDto.setLocalName("在途仓库"); |
|
|
|
scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); |
|
|
|
scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); |
|
|
|
} |
|
|
|
scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); |
|
|
|
String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); |
|
|
|
return sid; |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
* 外采收车推送业务采购入库单查询 |
|
|
|
* */ |
|
|
|
private String pushWCInBoundQuery(List<BaseVehicleDto> dto) { |
|
|
|
//推送车辆入库查询
|
|
|
|
ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); |
|
|
|
BaseVehicleDto baseVehicleDto = dto.get(0); |
|
|
|
BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.fetchBySid(baseVehicleDto.getOutSourcSid()); |
|
|
|
scmApplyInboundQueryDto.setOrgPriceDate(baseVehicleDto.getOrgPriceDate()); |
|
|
|
scmApplyInboundQueryDto.setManPurOrderTypeKey(baseVehicleDto.getManPurOrderTypeKey()); |
|
|
|
scmApplyInboundQueryDto.setManPurOrderTypeValue(baseVehicleDto.getManPurOrderTypeValue()); |
|
|
|
scmApplyInboundQueryDto.setApplicationCode(baseOutsourcingApplication.getApplicationCode()); |
|
|
|
scmApplyInboundQueryDto.setOrgDeptSid(baseOutsourcingApplication.getOrgSid()); |
|
|
|
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseOutsourcingApplication.getOrgSid()).getData(); |
|
|
|
scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); |
|
|
|
scmApplyInboundQueryDto.setPurchaseSystemCode(baseVehicleDto.getOrgCode()); |
|
|
|
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicleDto.getPurchaseSystemSid()).getData(); |
|
|
|
scmApplyInboundQueryDto.setPurchaseSystemName(baseVehicleDto.getPurchaseSystemName()); |
|
|
|
scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
scmApplyInboundQueryDto.setManSid(baseVehicleDto.getSupplierSid()); |
|
|
|
scmApplyInboundQueryDto.setManName(baseVehicleDto.getSupplierName()); |
|
|
|
scmApplyInboundQueryDto.setManCode(baseVehicleDto.getSupplierCode()); |
|
|
|
scmApplyInboundQueryDto.setMakeListSid(baseOutsourcingApplication.getCreateBySid()); |
|
|
|
scmApplyInboundQueryDto.setMakeListName(baseOutsourcingApplication.getCreateByName()); |
|
|
|
scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); |
|
|
|
scmApplyInboundQueryDto.setCreateOrgSid(baseOutsourcingApplication.getUseOrgSid()); |
|
|
|
scmApplyInboundQueryDto.setCreateOrgName(baseOutsourcingApplication.getUseOrgName()); |
|
|
|
scmApplyInboundQueryDto.setBusSid(baseOutsourcingApplication.getSid()); |
|
|
|
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>(); |
|
|
|
for (BaseVehicleDto baseVehicleDto1 : dto) { |
|
|
|
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); |
|
|
|
scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); |
|
|
|
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); |
|
|
|
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); |
|
|
|
BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData(); |
|
|
|
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType()); |
|
|
|
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); |
|
|
|
scmApplyInboundVehQueryDto.setIunit("辆"); |
|
|
|
scmApplyInboundVehQueryDto.setNum("1"); |
|
|
|
scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice())); |
|
|
|
scmApplyInboundVehQueryDto.setLocalName("在途仓库"); |
|
|
|
scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); |
|
|
|
scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); |
|
|
|
} |
|
|
|
scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); |
|
|
|
String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); |
|
|
|
return sid; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 推送金蝶采购入库单 |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
*/ |
|
|
|
private void kingdeeStkInStock(List<BaseVehicleDto> dto) { |
|
|
|
/*private void kingdeeStkInStock(List<BaseVehicleDto> dto) { |
|
|
|
try { |
|
|
|
StkInStock stkInStock = new StkInStock(); |
|
|
|
BaseVehicleDto baseVehicle = dto.get(0); |
|
|
|
@ -457,7 +563,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
stkInStock.setFSupplierId(baseVehicle.getSupplierCode()); |
|
|
|
//String orgSid = baseVehicle.getCreateOrgSid();
|
|
|
|
//分公司id
|
|
|
|
/*ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); |
|
|
|
*//*ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
|
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
SysOrganizationVo vo = resultBean.getData(); |
|
|
|
if (vo != null) { |
|
|
|
@ -466,8 +572,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
stkInStock.setTOrgId(vo.getOrgCode()); |
|
|
|
|
|
|
|
} |
|
|
|
}*/ |
|
|
|
/*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采
|
|
|
|
}*//*
|
|
|
|
*//*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采
|
|
|
|
//根据外采编号查询外采的申请人部门
|
|
|
|
BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo()); |
|
|
|
String createBySid = baseOutsourcingApplication.getCreateBySid(); |
|
|
|
@ -496,45 +602,45 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
//车型品牌对应厂商生成的分公司的主机厂供应商编码
|
|
|
|
String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); |
|
|
|
stkInStock.setFSupplierId(manCode); |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
}*//*
|
|
|
|
*//**
|
|
|
|
* // 入库日期:FDate (必填项)
|
|
|
|
*/ |
|
|
|
stkInStock.setFDate(baseVehicle.getOrgPriceDate()); |
|
|
|
*//*
|
|
|
|
stkInStock.setFDate(baseVehicle.getPriceDate()); |
|
|
|
|
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* // 物料列表:FInStockEntry (必填项)
|
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>(); |
|
|
|
//直接调拨单的物料列表
|
|
|
|
List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>(); |
|
|
|
for (BaseVehicleDto baseVehicleDto : dto) { |
|
|
|
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); |
|
|
|
sf.setWlfz(baseVehicleDto.getCarBrandCode()); |
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* 物料分组 |
|
|
|
*/ |
|
|
|
/*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); |
|
|
|
*//*
|
|
|
|
*//*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid());
|
|
|
|
if (baseVehicleBrand != null) { |
|
|
|
sf.setWlfz(baseVehicleBrand.getBrandCode()); |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
}*//*
|
|
|
|
*//**
|
|
|
|
* 单价 对应厂家结算价 |
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
sf.setFPrice(baseVehicleDto.getCostPrice() + ""); |
|
|
|
|
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* 车辆类型 |
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
//厂家采购
|
|
|
|
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || |
|
|
|
ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { |
|
|
|
//根据sid查询
|
|
|
|
/* BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); |
|
|
|
*//* BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid());
|
|
|
|
if (baseManufacturerBank != null) { |
|
|
|
sf.setCllx(baseManufacturerBank.getActualPayKey()); |
|
|
|
sf.setCllxType("sellChannel"); |
|
|
|
}*/ |
|
|
|
}*//*
|
|
|
|
//车辆类型-厂家外采和调车
|
|
|
|
sf.setCllx(baseVehicleDto.getManufSaleAccessKey()); |
|
|
|
sf.setCllxType("sellChannel"); |
|
|
|
@ -549,20 +655,20 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
sf.setFCategoryIDType("purchaseOrderType"); |
|
|
|
sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey()); |
|
|
|
|
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* // 批号:FLot
|
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
sf.setFLot(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* // 物料编码:FMaterialId (必填项)
|
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
sf.setFMaterialId(baseVehicleDto.getVinNo().substring(baseVehicleDto.getVinNo().length() - 8)); |
|
|
|
/** |
|
|
|
*//**
|
|
|
|
* // 仓库:FStockId-目前只分在途和正式两个仓库。
|
|
|
|
*/ |
|
|
|
*//*
|
|
|
|
//仓库编码
|
|
|
|
sf.setFStockId("ARZSCK"); |
|
|
|
/*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { |
|
|
|
*//*if (StringUtils.isBlank(baseVehicleDto.getLocation())) {
|
|
|
|
// 在途仓库
|
|
|
|
sf.setFStockId("ARZTCK"); |
|
|
|
} else { |
|
|
|
@ -571,7 +677,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); |
|
|
|
sf.setFStockId(data.getGressionCode()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
}*//*
|
|
|
|
fInStockEntry.add(sf); |
|
|
|
//填充直接调拨单物料列表数据
|
|
|
|
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); |
|
|
|
@ -593,7 +699,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/*** |
|
|
|
* 只是更新验车推送数据作用，验车推送需要更新的字段属性 |
|
|
|
|
God
2 years ago