diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 9930d9dca3..063d8cf676 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/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= date_format('" + warehousingStartDate + "','%Y-%m-%d')"). diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 97055abdda..318e2bd555 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseVehinstallService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseVehinstallService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - public ResultBean> vehInsMod(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseVehinstallService.vehInsMod(pq); - return rb.success().setData(pv); - } + @Override + public ResultBean> vehInsMod(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 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 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 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 fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean selectOne(String vinNo, String useOrgSid) { - return baseVehinstallService.selectOne(vinNo,useOrgSid); - } + @Override + public ResultBean selectOne(String vinNo, String useOrgSid) { + return baseVehinstallService.selectOne(vinNo, useOrgSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index e2fc0b6f90..fcd184b016 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);