|
|
|
@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; |
|
|
|
@ -235,6 +236,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
int count = baseVehicleService.selectCountByVinNo(vinNo); |
|
|
|
ResultBean<BaseVehicleVo> baseVehicleVoResultBean = baseVehicleService.selVehicleByVinNo(vinNo); |
|
|
|
BaseVehicleVo data = baseVehicleVoResultBean.getData(); |
|
|
|
BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); |
|
|
|
if (baseManufacturerSidVo != null) { |
|
|
|
dto.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); |
|
|
|
dto.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); |
|
|
|
} |
|
|
|
buildVehicle(dto); |
|
|
|
if (count > 0) { |
|
|
|
ResultBean resultBean = update(dto, data.getSid()); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
@ -243,6 +250,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
return rb.success().setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
BaseVehicle baseVehicle = new BaseVehicle(); |
|
|
|
String sid = baseVehicle.getSid(); |
|
|
|
dto.fillEntity(baseVehicle); |
|
|
|
//锁定状态
|
|
|
|
/*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode(); |
|
|
|
@ -252,22 +260,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); |
|
|
|
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); |
|
|
|
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/ |
|
|
|
baseVehicle.setLockedState(dto.getLockedState()); |
|
|
|
/* baseVehicle.setLockedState(dto.getLockedState()); |
|
|
|
baseVehicle.setLockedStateValue(dto.getLockedStateValue()); |
|
|
|
baseVehicle.setVehicleState(dto.getVehicleState()); |
|
|
|
baseVehicle.setVehicleStateValue(dto.getVehicleStateValue()); |
|
|
|
baseVehicle.setSettlementStatus(dto.getSettlementStatus()); |
|
|
|
baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue()); |
|
|
|
baseVehicle.setWitPinState(dto.getWitPinState()); |
|
|
|
baseVehicle.setWitPinStateValue(dto.getWitPinStateValue()); |
|
|
|
baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());*/ |
|
|
|
|
|
|
|
BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); |
|
|
|
if (baseManufacturerSidVo != null) { |
|
|
|
baseVehicle.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); |
|
|
|
baseVehicle.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); |
|
|
|
} |
|
|
|
|
|
|
|
baseVehicle.setSid(sid); |
|
|
|
boolean isSave = baseVehicleService.save(baseVehicle); |
|
|
|
//生成合格证信息
|
|
|
|
if (StringUtils.isNotBlank(dto.getVinNo())) { |
|
|
|
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); |
|
|
|
baseVehicleCertificate.setVinNo(dto.getVinNo()); |
|
|
|
@ -287,6 +292,32 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public void buildVehicle(BaseVehicleDto dto){ |
|
|
|
//分公司code
|
|
|
|
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); |
|
|
|
dto.setOrgCode(sysOrganizationVo1.getOrgCode()); |
|
|
|
//库存地点编码
|
|
|
|
ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(dto.getLocation()).getData(); |
|
|
|
dto.setLocationCode(scmWarehouseVo.getGressionCode());//库存地点编码
|
|
|
|
//部门编码
|
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getPurchaseSystemSid()).getData(); |
|
|
|
dto.setPurchaseSystemCode(sysOrganizationVo.getOrgCode()); |
|
|
|
//厂家回款通路类别key
|
|
|
|
BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(dto.getManufSaleAccessSid()); |
|
|
|
dto.setManufSaleAccessKey(baseManufacturerBank.getActualPayKey()); |
|
|
|
//付款通路code
|
|
|
|
dto.setPaymentAccessNoKey(baseManufacturerBank.getPaymentAccessNoKey()); |
|
|
|
//品牌编码
|
|
|
|
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(dto.getCarBrandSid()); |
|
|
|
dto.setCarBrandCode(baseVehicleBrand.getBrandCode()); |
|
|
|
//厂商编码
|
|
|
|
BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(dto.getManufacturerSid()); |
|
|
|
dto.setManufacturerCode(baseManufacturer.getManufacturerCode()); |
|
|
|
//供应商code
|
|
|
|
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(dto.getSupplierSid()).getData(); |
|
|
|
dto.setSupplierCode(sysOrganizationVo2.getOtherCode()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean saveOrUpdate(List<BaseVehicleDto> dto, String eventType) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
@ -331,9 +362,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
try { |
|
|
|
StkInStock stkInStock = new StkInStock(); |
|
|
|
BaseVehicleDto baseVehicle = dto.get(0); |
|
|
|
String orgSid = baseVehicle.getCreateOrgSid(); |
|
|
|
stkInStock.setFPurchaseOrgId(baseVehicle.getOrgCode()); |
|
|
|
stkInStock.setTOrgId(baseVehicle.getOrgCode()); |
|
|
|
stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode()); |
|
|
|
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) { |
|
|
|
@ -342,8 +377,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(); |
|
|
|
@ -365,72 +400,64 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
if (pcResubean.getSuccess()) { |
|
|
|
SysOrganizationVo vo = pcResubean.getData(); |
|
|
|
if (vo != null) { |
|
|
|
//采购部门
|
|
|
|
stkInStock.setFPurchaseDeptId(vo.getOrgCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
//车型品牌对应厂商生成的分公司的主机厂供应商编码
|
|
|
|
String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); |
|
|
|
stkInStock.setFSupplierId(manCode); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* // 入库日期:FDate (必填项)
|
|
|
|
*/ |
|
|
|
stkInStock.setFDate(DateUtil.now()); |
|
|
|
/** |
|
|
|
* // 采购部门:FPurchaseDeptId (必填项)
|
|
|
|
*/ |
|
|
|
// stkInStock.setFPurchaseDeptId("05.04");
|
|
|
|
/** |
|
|
|
* //采购组织:FPurchaseOrgId (必填项)
|
|
|
|
*/ |
|
|
|
// stkInStock.setFPurchaseOrgId("101");
|
|
|
|
/** |
|
|
|
* // 供应商:FSupplierId (必填项)
|
|
|
|
*/ |
|
|
|
// stkInStock.setFSupplierId("010001");
|
|
|
|
/** |
|
|
|
* //分配目标组织:TOrgId (必填项)
|
|
|
|
*/ |
|
|
|
// stkInStock.setTOrgId("100012");
|
|
|
|
|
|
|
|
/** |
|
|
|
* // 物料列表:FInStockEntry (必填项)
|
|
|
|
*/ |
|
|
|
List<StkInStock.FInStockEntry> fInStockEntry = 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"); |
|
|
|
} else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { |
|
|
|
/** |
|
|
|
* 车辆类型 |
|
|
|
*/ |
|
|
|
//车辆类型-外采主车
|
|
|
|
sf.setCllx("60"); |
|
|
|
sf.setCllxType("sellChannel"); |
|
|
|
//物料分组-外采主车
|
|
|
|
sf.setWlfz("99.01"); |
|
|
|
//sf.setFCategoryID("CHLB03_SYS");//外采车
|
|
|
|
} |
|
|
|
//存货类别
|
|
|
|
sf.setFCategoryIDType("purchaseOrderType"); |
|
|
|
sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey()); |
|
|
|
// sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
|
|
|
|
// sf.setCllxType("03");
|
|
|
|
|
|
|
|
/** |
|
|
|
* // 批号:FLot
|
|
|
|
*/ |
|
|
|
@ -440,9 +467,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
*/ |
|
|
|
sf.setFMaterialId(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
* // 仓库:FStockId
|
|
|
|
* // 仓库:FStockId-目前只分在途和正式两个仓库。
|
|
|
|
*/ |
|
|
|
if (StringUtils.isBlank(baseVehicleDto.getLocation())) { |
|
|
|
//仓库编码
|
|
|
|
sf.setFStockId(baseVehicleDto.getLocationCode()); |
|
|
|
/*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { |
|
|
|
// 在途仓库
|
|
|
|
sf.setFStockId("ARZTCK"); |
|
|
|
} else { |
|
|
|
@ -451,13 +480,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); |
|
|
|
sf.setFStockId(data.getGressionCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
// sf.setWlfz("01");
|
|
|
|
/** |
|
|
|
* 物料分组 |
|
|
|
*/ |
|
|
|
// sf.setWlfzType("01");
|
|
|
|
fInStockEntry.add(sf); |
|
|
|
} |
|
|
|
stkInStock.setFInStockEntry(fInStockEntry); |
|
|
|
|
