Browse Source

问题修改

zhanglei
God 2 years ago
parent
commit
d2ebca77aa
  1. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  2. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
  4. 236
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
  5. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@ -146,6 +146,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
if (StringUtils.isNotBlank(query.getCarModelName())) { if (StringUtils.isNotBlank(query.getCarModelName())) {
qw.like("btm.carModelName", query.getCarModelName()); qw.like("btm.carModelName", query.getCarModelName());
} }
qw.orderByDesc("bt.createTime");
String warehousingStartDate = query.getWarehousingStartDate(); String warehousingStartDate = query.getWarehousingStartDate();
String warehousingEndDate = query.getWarehousingEndDate(); String warehousingEndDate = query.getWarehousingEndDate();
qw.apply(StringUtils.isNotEmpty(warehousingStartDate), "date_format (bt.warehousingDate,'%Y-%m-%d') >= date_format('" + warehousingStartDate + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(warehousingStartDate), "date_format (bt.warehousingDate,'%Y-%m-%d') >= date_format('" + warehousingStartDate + "','%Y-%m-%d')").

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -2757,6 +2757,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(dto.getVehMark())) { if (StringUtils.isNotBlank(dto.getVehMark())) {
baseVehicle.setVehMark(dto.getVehMark()); baseVehicle.setVehMark(dto.getVehMark());
} }
if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
}
} }
public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) { public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@ -2925,6 +2928,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(dto.getVehMark())) { if (StringUtils.isNotBlank(dto.getVehMark())) {
baseVehicle.setVehMark(dto.getVehMark()); baseVehicle.setVehMark(dto.getVehMark());
} }
if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
}
} }
/** /**

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@ -17,8 +17,8 @@
bv.vehModel, bv.vehModel,
bv.vinNo, bv.vinNo,
bv.vehicleStateValue, bv.vehicleStateValue,
bv.priceDate, bvm.priceDate,
bv.salesDate, bvm.salesDate,
bv.costPrice, bv.costPrice,
bv.guidePrice, bv.guidePrice,
bv.vehModelSid bv.vehModelSid

236
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

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

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@ -112,6 +112,7 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
if (StringUtils.isNotBlank(query.getVinNo())){ if (StringUtils.isNotBlank(query.getVinNo())){
qw.like("bv.vinNo",query.getVinNo()); qw.like("bv.vinNo",query.getVinNo());
} }
qw.orderByDesc("bvm.createTime");
IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq); IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw); IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);

Loading…
Cancel
Save