diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 4379c96190..3d82b900c4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -365,6 +365,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (pcResubean.getSuccess()) { SysOrganizationVo vo = pcResubean.getData(); if (vo != null) { + //采购部门 stkInStock.setFPurchaseDeptId(vo.getOrgCode()); } } @@ -376,22 +377,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { * // 入库日期:FDate (必填项) */ stkInStock.setFDate(DateUtil.now()); - /** - * // 采购部门:FPurchaseDeptId (必填项) - */ -// stkInStock.setFPurchaseDeptId("05.04"); - /** - * //采购组织:FPurchaseOrgId (必填项) - */ -// stkInStock.setFPurchaseOrgId("101"); - /** - * // 供应商:FSupplierId (必填项) - */ -// stkInStock.setFSupplierId("010001"); - /** - * //分配目标组织:TOrgId (必填项) - */ -// stkInStock.setTOrgId("100012"); + /** * // 物料列表:FInStockEntry (必填项) */ @@ -409,6 +395,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 单价 对应厂家结算价 */ sf.setFPrice(baseVehicleDto.getCostPrice() + ""); + + /** + * 车辆类型 + */ + //厂家采购 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //根据sid查询 @@ -417,20 +408,17 @@ public class BaseVehicleRest implements BaseVehicleFeign { sf.setCllx(baseManufacturerBank.getActualPayKey()); 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,7 +428,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { */ sf.setFMaterialId(baseVehicleDto.getVinNo()); /** - * // 仓库:FStockId + * // 仓库:FStockId-目前只分在途和正式两个仓库。 */ if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 @@ -453,11 +441,6 @@ public class BaseVehicleRest implements BaseVehicleFeign { } } -// sf.setWlfz("01"); - /** - * 物料分组 - */ - // sf.setWlfzType("01"); fInStockEntry.add(sf); } stkInStock.setFInStockEntry(fInStockEntry);