|
|
@ -28,10 +28,12 @@ package com.yxt.anrui.base.biz.basevehinstall; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; |
|
|
|
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; |
|
|
|
import com.yxt.anrui.base.api.basevehinstall.*; |
|
|
|
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; |
|
|
|
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; |
|
|
|
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; |
|
|
|
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; |
|
|
|
import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; |
|
|
@ -69,131 +71,127 @@ import java.util.List; |
|
|
|
@RequestMapping("v1/basevehinstall") |
|
|
|
public class BaseVehinstallRest implements BaseVehinstallFeign { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BaseVehinstallService baseVehinstallService; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehinstallmodelService baseVehinstallmodelService; |
|
|
|
@Autowired |
|
|
|
private BaseManufacturerService baseManufacturerService; |
|
|
|
@Resource |
|
|
|
private FinKingDeeFeign finKingDeeFeign; |
|
|
|
@Autowired |
|
|
|
private BasePurchaseSystemService basePurchaseSystemService; |
|
|
|
@Autowired |
|
|
|
private BaseVehinstallService baseVehinstallService; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehinstallmodelService baseVehinstallmodelService; |
|
|
|
@Autowired |
|
|
|
private BaseManufacturerService baseManufacturerService; |
|
|
|
@Resource |
|
|
|
private FinKingDeeFeign finKingDeeFeign; |
|
|
|
@Autowired |
|
|
|
private BasePurchaseSystemService basePurchaseSystemService; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleService baseVehicleService; |
|
|
|
|
|
|
|
@Override |
|
|
|
@ApiOperation("根据条件分页查询数据的列表") |
|
|
|
@PostMapping("/listPage") |
|
|
|
public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq){ |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
PagerVo<BaseVehinstallVo> pv = baseVehinstallService.listPageVo(pq); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
@Override |
|
|
|
@ApiOperation("根据条件分页查询数据的列表") |
|
|
|
@PostMapping("/listPage") |
|
|
|
public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
PagerVo<BaseVehinstallVo> pv = baseVehinstallService.listPageVo(pq); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
PagerVo<BaseVehinstallVo> pv = baseVehinstallService.vehInsMod(pq); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
@Override |
|
|
|
public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
PagerVo<BaseVehinstallVo> pv = baseVehinstallService.vehInsMod(pq); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ApiOperation("新增或修改") |
|
|
|
@PostMapping("/save") |
|
|
|
public ResultBean save(@RequestBody BaseVehinstallDto dto){ |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String vinNo = dto.getVinNo(); |
|
|
|
String costPrice = dto.getCostPrice(); |
|
|
|
String guidePrice = dto.getGuidePrice(); |
|
|
|
if (StringUtils.isBlank(vinNo)){ |
|
|
|
return rb.setMsg("请选择主车车架号"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(costPrice)){ |
|
|
|
return rb.setMsg("请填写厂家结算价"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(guidePrice)){ |
|
|
|
return rb.setMsg("请填写销售指导价"); |
|
|
|
} |
|
|
|
baseVehinstallService.saveOrUpdateDto(dto); |
|
|
|
if (StringUtils.isBlank(dto.getSid())){ |
|
|
|
StkInStock stkInStock = new StkInStock(); |
|
|
|
//入库日期:FDate (必填项)
|
|
|
|
stkInStock.setFDate(DateUtil.formatDate(new Date())); |
|
|
|
//采购部门:FPurchaseDeptId (必填项)
|
|
|
|
String departmentSid = dto.getDepartmentSid(); |
|
|
|
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData(); |
|
|
|
stkInStock.setFPurchaseDeptId(data.getOrgCode()); |
|
|
|
//采购组织:FPurchaseOrgId (必填项)
|
|
|
|
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData(); |
|
|
|
if (basePurchaseSystemDetailsVo != null){ |
|
|
|
stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
//分配目标组织:TOrgId (必填项)
|
|
|
|
stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
}else { |
|
|
|
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()); |
|
|
|
SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); |
|
|
|
if (vo != null) { |
|
|
|
stkInStock.setFPurchaseOrgId(vo.getOrgCode()); |
|
|
|
//分配目标组织:TOrgId (必填项)
|
|
|
|
stkInStock.setTOrgId(vo.getOrgCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
//供应商:FSupplierId (必填项)
|
|
|
|
String mainSid = dto.getMainSid(); |
|
|
|
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid); |
|
|
|
BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid()); |
|
|
|
stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); |
|
|
|
//物料列表:FInStockEntry (必填项)
|
|
|
|
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>(); |
|
|
|
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); |
|
|
|
//单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
|
|
|
|
sf.setFPrice(dto.getCostPrice()); |
|
|
|
//车辆类型
|
|
|
|
sf.setCllx("61"); |
|
|
|
sf.setCllxType("sellChannel"); |
|
|
|
//批号:FLot
|
|
|
|
sf.setFLot(dto.getVinNo()); |
|
|
|
//物料编码:FMaterialId (必填项)
|
|
|
|
sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ"); |
|
|
|
//仓库:FStockId
|
|
|
|
sf.setFStockId("ARZSCK"); |
|
|
|
//物料分组
|
|
|
|
sf.setWlfz("99.02"); |
|
|
|
//存货类别
|
|
|
|
sf.setFCategoryIDKey("005"); |
|
|
|
sf.setFCategoryIDType("purchaseOrderType"); |
|
|
|
fInStockEntry.add(sf); |
|
|
|
stkInStock.setFInStockEntry(fInStockEntry); |
|
|
|
try { |
|
|
|
finKingDeeFeign.draftStkInStock(stkInStock); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
@Override |
|
|
|
@ApiOperation("新增或修改") |
|
|
|
@PostMapping("/save") |
|
|
|
public ResultBean save(@RequestBody BaseVehinstallDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String vinNo = dto.getVinNo(); |
|
|
|
String costPrice = dto.getCostPrice(); |
|
|
|
String guidePrice = dto.getGuidePrice(); |
|
|
|
if (StringUtils.isBlank(vinNo)) { |
|
|
|
return rb.setMsg("请选择主车车架号"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(costPrice)) { |
|
|
|
return rb.setMsg("请填写厂家结算价"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(guidePrice)) { |
|
|
|
return rb.setMsg("请填写销售指导价"); |
|
|
|
} |
|
|
|
baseVehinstallService.saveOrUpdateDto(dto); |
|
|
|
if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
StkInStock stkInStock = new StkInStock(); |
|
|
|
//入库日期:FDate (必填项)
|
|
|
|
stkInStock.setFDate(DateUtil.formatDate(new Date())); |
|
|
|
//获取主车信息
|
|
|
|
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, dto.getCreateOrg()); |
|
|
|
//获取主车采购系统sid
|
|
|
|
String purchaseSystemSid = baseVehicle.getPurchaseSystemSid(); |
|
|
|
//根据采购系统sid获取部门组织信息
|
|
|
|
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData(); |
|
|
|
//采购部门:FPurchaseDeptId (必填项)
|
|
|
|
stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode()); |
|
|
|
//采购组织:FPurchaseOrgId (必填项)
|
|
|
|
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); |
|
|
|
stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
//分配目标组织:TOrgId (必填项)
|
|
|
|
stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode()); |
|
|
|
//供应商:FSupplierId (必填项)
|
|
|
|
String mainSid = dto.getMainSid(); |
|
|
|
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid); |
|
|
|
BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid()); |
|
|
|
stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); |
|
|
|
//物料列表:FInStockEntry (必填项)
|
|
|
|
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>(); |
|
|
|
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); |
|
|
|
//单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
|
|
|
|
sf.setFPrice(dto.getCostPrice()); |
|
|
|
//车辆类型
|
|
|
|
sf.setCllx("61"); |
|
|
|
sf.setCllxType("sellChannel"); |
|
|
|
//批号:FLot
|
|
|
|
sf.setFLot(dto.getVinNo()); |
|
|
|
//物料编码:FMaterialId (必填项)
|
|
|
|
sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ"); |
|
|
|
//仓库:FStockId
|
|
|
|
sf.setFStockId("ARZSCK"); |
|
|
|
//物料分组
|
|
|
|
sf.setWlfz("99.02"); |
|
|
|
//存货类别
|
|
|
|
sf.setFCategoryIDKey("005"); |
|
|
|
sf.setFCategoryIDType("purchaseOrderType"); |
|
|
|
fInStockEntry.add(sf); |
|
|
|
stkInStock.setFInStockEntry(fInStockEntry); |
|
|
|
try { |
|
|
|
finKingDeeFeign.draftStkInStock(stkInStock); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ApiOperation("根据sid批量删除") |
|
|
|
@Override |
|
|
|
@ApiOperation("根据sid批量删除") |
|
|
|
@PostMapping("/delBySids") |
|
|
|
public ResultBean delBySids(@RequestBody String[] sids){ |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
baseVehinstallService.delBySids(sids); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
public ResultBean delBySids(@RequestBody String[] sids) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
baseVehinstallService.delBySids(sids); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ApiOperation("根据SID获取一条记录") |
|
|
|
@Override |
|
|
|
@ApiOperation("根据SID获取一条记录") |
|
|
|
@GetMapping("/fetchDetailsBySid/{sid}") |
|
|
|
public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) { |
|
|
|
return baseVehinstallService.selectOne(vinNo,useOrgSid); |
|
|
|
} |
|
|
|
@Override |
|
|
|
public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) { |
|
|
|
return baseVehinstallService.selectOne(vinNo, useOrgSid); |
|
|
|
} |
|
|
|
} |
|
|
|