|
|
|
@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.*; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
@ -181,11 +183,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode())) |
|
|
|
baseVehicleService.updateVeh(baseVehicle); |
|
|
|
//入账生成台账
|
|
|
|
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){ |
|
|
|
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { |
|
|
|
baseVehicleService.saveVeh_rz(baseVehicle); |
|
|
|
} |
|
|
|
//外采入库生成台账
|
|
|
|
if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ |
|
|
|
if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { |
|
|
|
baseVehicleService.saveVeh_wc(baseVehicle); |
|
|
|
} |
|
|
|
//调车入库生成台账
|
|
|
|
@ -193,7 +195,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
baseVehicleService.saveVeh_tc(baseVehicle); |
|
|
|
} |
|
|
|
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()) |
|
|
|
||eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { |
|
|
|
|| eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { |
|
|
|
kingdeeStkInStock(dto); |
|
|
|
} |
|
|
|
return rb.success().setMsg("保存成功"); |
|
|
|
@ -201,68 +203,69 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
|
|
|
|
/** |
|
|
|
* 推送金蝶采购入库单 |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
*/ |
|
|
|
private void kingdeeStkInStock(List<BaseVehicleDto> dto ) { |
|
|
|
try{ |
|
|
|
StkInStock stkInStock=new StkInStock(); |
|
|
|
private void kingdeeStkInStock(List<BaseVehicleDto> dto) { |
|
|
|
try { |
|
|
|
StkInStock stkInStock = new StkInStock(); |
|
|
|
/** |
|
|
|
* // 入库日期: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(); |
|
|
|
/** |
|
|
|
* // 入库日期:FDate (必填项)
|
|
|
|
* 单价 对应厂家结算价 |
|
|
|
*/ |
|
|
|
stkInStock.setFDate(DateUtil.now()); |
|
|
|
sf.setFPrice(baseVehicleDto.getCostPrice() + ""); |
|
|
|
|
|
|
|
/** |
|
|
|
* // 采购部门:FPurchaseDeptId (必填项)
|
|
|
|
* 车辆类型 |
|
|
|
*/ |
|
|
|
stkInStock.setFPurchaseDeptId("05.04"); |
|
|
|
sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
|
|
|
|
|
|
|
|
/** |
|
|
|
* //采购组织:FPurchaseOrgId (必填项)
|
|
|
|
* // 批号:FLot
|
|
|
|
*/ |
|
|
|
stkInStock.setFPurchaseOrgId("101"); |
|
|
|
sf.setFLot(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
* // 供应商:FSupplierId (必填项)
|
|
|
|
* // 物料编码:FMaterialId (必填项)
|
|
|
|
*/ |
|
|
|
stkInStock.setFSupplierId("010001"); |
|
|
|
sf.setFMaterialId(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
* //分配目标组织:TOrgId (必填项)
|
|
|
|
* // 仓库:FStockId
|
|
|
|
*/ |
|
|
|
stkInStock.setTOrgId("100012"); |
|
|
|
sf.setFStockId("CK001"); |
|
|
|
/** |
|
|
|
* // 物料列表:FInStockEntry (必填项)
|
|
|
|
* 物料分组 |
|
|
|
*/ |
|
|
|
List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>(); |
|
|
|
for (BaseVehicleDto baseVehicleDto : dto) { |
|
|
|
StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry(); |
|
|
|
/** |
|
|
|
* 单价 对应厂家结算价 |
|
|
|
*/ |
|
|
|
sf.setFPrice(baseVehicleDto.getCostPrice()+""); |
|
|
|
|
|
|
|
/** |
|
|
|
* 车辆类型 |
|
|
|
*/ |
|
|
|
sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
|
|
|
|
|
|
|
|
/** |
|
|
|
* // 批号:FLot
|
|
|
|
*/ |
|
|
|
sf.setFLot(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
* // 物料编码:FMaterialId (必填项)
|
|
|
|
*/ |
|
|
|
sf.setFMaterialId(baseVehicleDto.getVinNo()); |
|
|
|
/** |
|
|
|
* // 仓库:FStockId
|
|
|
|
*/ |
|
|
|
sf.setFStockId("CK001"); |
|
|
|
/** |
|
|
|
* 物料分组 |
|
|
|
*/ |
|
|
|
sf.setWlfz("01"); |
|
|
|
fInStockEntry.add(sf); |
|
|
|
} |
|
|
|
stkInStock.setFInStockEntry(fInStockEntry); |
|
|
|
finKingDeeFeign.draftStkInStock(stkInStock); |
|
|
|
}catch (Exception e){ |
|
|
|
sf.setWlfz("01"); |
|
|
|
fInStockEntry.add(sf); |
|
|
|
} |
|
|
|
stkInStock.setFInStockEntry(fInStockEntry); |
|
|
|
finKingDeeFeign.draftStkInStock(stkInStock); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -856,7 +859,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
PagerVo<AppScmWarehouseVinVo> page = new PagerVo<>(); |
|
|
|
//查询在申请的存放地点变更车辆的车辆sid
|
|
|
|
List<String> stringList = baseVehicleTempstateService.selectAll("001"); |
|
|
|
IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList); |
|
|
|
IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery, stringList); |
|
|
|
PagerVo<AppScmWarehouseVinVo> pagerVo = PagerUtil.pageToVo(iPage, page); |
|
|
|
return new ResultBean<PagerVo<AppScmWarehouseVinVo>>().success().setData(pagerVo); |
|
|
|
} |
|
|
|
@ -868,7 +871,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) { |
|
|
|
return baseVehicleService.selectPatrolinspections(userSid,vinNoList); |
|
|
|
return baseVehicleService.selectPatrolinspections(userSid, vinNoList); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -898,5 +901,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { |
|
|
|
List<Map<String, String>> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query); |
|
|
|
return rb.success().setData(pcInspectionVinList); |
|
|
|
} |
|
|
|
@Override |
|
|
|
public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(PagerQuery<InputVinListQuery> query) { |
|
|
|
ResultBean<PagerVo<InputVinListVo>> rb = ResultBean.fireFail(); |
|
|
|
PagerVo<InputVinListVo> pv = baseVehicleService.saleOrderVin(query); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
