From 5f5c062ff3bf9f2c4a57996944443805891830f3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 31 May 2023 16:24:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E3=80=81=E6=AC=A0=E6=AC=BE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=BB=B4=E6=8A=A4=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basetrailer/BaseTrailerService.java | 8 +- .../basevehinstall/BaseVehinstallService.java | 824 +++++++++--------- .../CrmCustomerTempService.java | 10 +- .../FinCompanyInvoicingDetailsVo.java | 4 + .../FinCompanyInvoicingService.java | 8 +- 5 files changed, 432 insertions(+), 422 deletions(-) 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 7117d0544d..0220d9c648 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 @@ -543,12 +543,12 @@ public class BaseTrailerService extends MybatisBaseService @@ -89,432 +90,437 @@ import java.util.List; @Service public class BaseVehinstallService extends MybatisBaseService { - @Autowired - private BaseVehinstallmodelService baseVehinstallmodelService; - @Autowired - private BaseVehicleService baseVehicleService; - @Autowired - private BaseVehmodelConfigService baseVehmodelConfigService; - @Autowired - private BaseVehicleOutService baseVehicleOutService; - @Autowired - private BasePurchaseSystemService basePurchaseSystemService; - @Autowired - private BaseVehicleOutApplyService baseVehicleOutApplyService; - @Resource - private FinKingDeeFeign finKingDeeFeign; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehinstallmodelService baseVehinstallmodelService; + @Autowired + private BaseVehicleService baseVehicleService; + @Autowired + private BaseVehmodelConfigService baseVehmodelConfigService; + @Autowired + private BaseVehicleOutService baseVehicleOutService; + @Autowired + private BasePurchaseSystemService basePurchaseSystemService; + @Autowired + private BaseVehicleOutApplyService baseVehicleOutApplyService; + @Resource + private FinKingDeeFeign finKingDeeFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; - private QueryWrapper createQueryWrapper(BaseVehinstallQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BaseVehinstallQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bv.createOrg",query.getCreateOrgSid()); - qw.eq("bvm.createOrgSid",query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getVehicleTypeKey())){ - qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey()); - } - if (StringUtils.isNotBlank(query.getRefitMethodKey())){ - qw.eq("bvm.refitMethodKey",query.getRefitMethodKey()); - } - if (StringUtils.isNotBlank(query.getRefitFactory())){ - qw.like("bvm.refitFactory",query.getRefitFactory()); - } - if (StringUtils.isNotBlank(query.getInstallNameKey())){ - qw.eq("bvm.installNameKey",query.getInstallNameKey()); - } - if (StringUtils.isNotBlank(query.getColorKey())){ - qw.eq("bvm.colorKey",query.getColorKey()); - } - if (StringUtils.isNotBlank(query.getPlateMaterialKey())){ - qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey()); - } - if (StringUtils.isNotBlank(query.getNoticeModel())){ - qw.like("bv.noticeModel",query.getNoticeModel()); - } - if (StringUtils.isNotBlank(query.getVinNo())){ - qw.like("bv.vinNo",query.getVinNo()); - } - qw.orderByDesc("bv.createTime"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseVehinstallDto dto){ + private QueryWrapper createQueryWrapper(BaseVehinstallQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseVehinstallQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bv.createOrg", query.getCreateOrgSid()); + qw.eq("bvm.createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getVehicleTypeKey())) { + qw.eq("bvm.vehicleTypeKey", query.getVehicleTypeKey()); + } + if (StringUtils.isNotBlank(query.getRefitMethodKey())) { + qw.eq("bvm.refitMethodKey", query.getRefitMethodKey()); + } + if (StringUtils.isNotBlank(query.getRefitFactory())) { + qw.like("bvm.refitFactory", query.getRefitFactory()); + } + if (StringUtils.isNotBlank(query.getInstallNameKey())) { + qw.eq("bvm.installNameKey", query.getInstallNameKey()); + } + if (StringUtils.isNotBlank(query.getColorKey())) { + qw.eq("bvm.colorKey", query.getColorKey()); + } + if (StringUtils.isNotBlank(query.getPlateMaterialKey())) { + qw.eq("bvm.plateMaterialKey", query.getPlateMaterialKey()); + } + if (StringUtils.isNotBlank(query.getNoticeModel())) { + qw.like("bv.noticeModel", query.getNoticeModel()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("bv.vinNo", query.getVinNo()); + } + qw.orderByDesc("bv.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BaseVehinstallDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseVehinstallDto dto){ - BaseVehinstall entity = new BaseVehinstall(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - String salesDate = entity.getSalesDate(); - if (StringUtils.isBlank(salesDate)){ - entity.setSalesDate(""); - } - baseMapper.insert(entity); - } - - public void updateByDto(BaseVehinstallDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BaseVehinstallDto dto) { + BaseVehinstall entity = new BaseVehinstall(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + String salesDate = entity.getSalesDate(); + if (StringUtils.isBlank(salesDate)) { + entity.setSalesDate(""); + } + baseMapper.insert(entity); + } + + public void updateByDto(BaseVehinstallDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - BaseVehinstall entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseVehinstallDetailsVo fetchDetailsVoBySid(String sid){ - BaseVehinstall entity = fetchBySid(sid); - BaseVehinstallDetailsVo vo = new BaseVehinstallDetailsVo(); - BeanUtil.copyProperties(entity, vo); - vo.setSid(sid); - String mainSid = vo.getMainSid(); - BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid); - vo.setBaseVehinstallmodel(baseVehinstallmodel); - return vo; - } + } + BaseVehinstall entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BaseVehinstallDetailsVo fetchDetailsVoBySid(String sid) { + BaseVehinstall entity = fetchBySid(sid); + BaseVehinstallDetailsVo vo = new BaseVehinstallDetailsVo(); + BeanUtil.copyProperties(entity, vo); + vo.setSid(sid); + String mainSid = vo.getMainSid(); + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid); + vo.setBaseVehinstallmodel(baseVehinstallmodel); + return vo; + } + + public List selectListVo(String createOrgSid) { + return baseMapper.selectListVo(createOrgSid); + } - public List selectListVo(String createOrgSid) { - return baseMapper.selectListVo(createOrgSid); - } + public PagerVo vehInsMod(PagerQuery pq) { + BaseVehinstallQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bv.createOrg", query.getCreateOrgSid()); + qw.eq("bvm.createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getVehicleTypeKey())) { + qw.eq("bvm.vehicleTypeKey", query.getVehicleTypeKey()); + } + if (StringUtils.isNotBlank(query.getRefitMethodKey())) { + qw.eq("bvm.refitMethodKey", query.getRefitMethodKey()); + } + if (StringUtils.isNotBlank(query.getRefitFactory())) { + qw.like("bvm.refitFactory", query.getRefitFactory()); + } + if (StringUtils.isNotBlank(query.getInstallNameKey())) { + qw.eq("bvm.installNameKey", query.getInstallNameKey()); + } + if (StringUtils.isNotBlank(query.getColorKey())) { + qw.eq("bvm.colorKey", query.getColorKey()); + } + if (StringUtils.isNotBlank(query.getPlateMaterialKey())) { + qw.eq("bvm.plateMaterialKey", query.getPlateMaterialKey()); + } + if (StringUtils.isNotBlank(query.getNoticeModel())) { + qw.like("bv.noticeModel", query.getNoticeModel()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("bv.vinNo", query.getVinNo()); + } + if (query.getJacketSidList().size() > 0) { + qw.notIn("bv.sid", query.getJacketSidList()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (BaseVehinstallVo record : records) { + String vinNo = record.getVinNo(); + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, query.getCreateOrgSid()); + String modelSid = baseVehicle.getModelSid(); + String modelConfigSid = baseVehicle.getModelConfigSid(); + BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(modelSid, modelConfigSid, query.getCreateOrgSid()); + String guidedPrice = baseVehmodelVo.getGuidedPrice(); + record.setVehGuidePrice(guidedPrice); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public PagerVo vehInsMod(PagerQuery pq) { - BaseVehinstallQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bv.createOrg",query.getCreateOrgSid()); - qw.eq("bvm.createOrgSid",query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getVehicleTypeKey())){ - qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey()); - } - if (StringUtils.isNotBlank(query.getRefitMethodKey())){ - qw.eq("bvm.refitMethodKey",query.getRefitMethodKey()); - } - if (StringUtils.isNotBlank(query.getRefitFactory())){ - qw.like("bvm.refitFactory",query.getRefitFactory()); - } - if (StringUtils.isNotBlank(query.getInstallNameKey())){ - qw.eq("bvm.installNameKey",query.getInstallNameKey()); - } - if (StringUtils.isNotBlank(query.getColorKey())){ - qw.eq("bvm.colorKey",query.getColorKey()); - } - if (StringUtils.isNotBlank(query.getPlateMaterialKey())){ - qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey()); - } - if (StringUtils.isNotBlank(query.getNoticeModel())){ - qw.like("bv.noticeModel",query.getNoticeModel()); - } - if (StringUtils.isNotBlank(query.getVinNo())){ - qw.like("bv.vinNo",query.getVinNo()); - } - if (query.getJacketSidList().size() > 0) { - qw.notIn("bv.sid", query.getJacketSidList()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (BaseVehinstallVo record : records) { - String vinNo = record.getVinNo(); - BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, query.getCreateOrgSid()); - String modelSid = baseVehicle.getModelSid(); - String modelConfigSid = baseVehicle.getModelConfigSid(); - BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(modelSid, modelConfigSid, query.getCreateOrgSid()); - String guidedPrice = baseVehmodelVo.getGuidedPrice(); - record.setVehGuidePrice(guidedPrice); - } - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } + public List selectByOrgSidAndVin(String orgSid, String vin) { + return baseMapper.selectByOrgSidAndVin(orgSid, vin); + } - public List selectByOrgSidAndVin(String orgSid, String vin) { - return baseMapper.selectByOrgSidAndVin(orgSid,vin); - } + public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) { + return baseMapper.fetchByVinNoAndOrgSid(vinNo, createOrgSid); + } - public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) { - return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid); - } + public ResultBean selectOne(String vinNo, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo, useOrgSid); + return rb.success().setData(baseVehinstall); + } - public ResultBean selectOne(String vinNo, String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo,useOrgSid); - return rb.success().setData(baseVehinstall); - } + public int selectNumGCRK(String bill) { + return baseMapper.selectNumGCRK(bill); + } - public int selectNumGCRK(String bill) { - return baseMapper.selectNumGCRK(bill); - } + public ResultBean vehinstallOut(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehinstall baseVehinstall = fetchBySid(sid); + if (baseVehinstall.getVehicleStateKey().equals("0002")) { + return rb.setMsg("该挂车已出库"); + } + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(), baseVehinstall.getCreateOrg()); + String vehicleState = baseVehicle.getVehicleState(); + if (!vehicleState.equals("0002")) { + return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); + } + BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid()); + BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); + BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid"); + baseVehicleOut.setTypeKey("003"); + baseVehicleOut.setType("上装挂车"); + String billNo = ""; + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + baseVehicleOut.setBillNo(billNo); + baseVehicleOut.setTrailerOrInstallMGroupCode("99.02"); + baseVehicleOut.setTrailerOrInstallMGroupName("挂车"); + baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); + baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid()); + baseVehicleOut.setTrailerOrInstallName("上装"); + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid()); + String wk_long = baseVehinstallmodel.getWk_long(); + String wk_wide = baseVehinstallmodel.getWk_wide(); + String wk_high = baseVehinstallmodel.getWk_high(); + String installName = baseVehinstallmodel.getInstallNameValue(); + StringBuilder vehinstallmodel = new StringBuilder(); + vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")"); + baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString()); + baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice()); + //备注 + String remarks1 = createRemarks(baseVehicleOut); + String remarks2 = baseVehicleOut.getRemarks(); + String remarks3 = remarks2 + remarks1; + if ("null".equals(remarks3)) { + remarks3 = ""; + } + baseVehicleOut.setRemarks(remarks3); + BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); + baseVehicleOutApply.setBillNo(billNo); + baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate()); + baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid()); + baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName()); + baseVehicleOutApply.setMobile(baseVehicleOut.getMobile()); + baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid()); + baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName()); + baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid()); + baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName()); + baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid()); + baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName()); + baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd")); + baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey()); + baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType()); + baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid()); + baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid()); + //保存车辆出库单主表 + baseVehicleOutApplyService.save(baseVehicleOutApply); + //出库单子表关联主表sid + baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); + baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid()); + baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName()); + baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey()); + baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue()); + //保存车辆出库单子表 + baseVehicleOutService.save(baseVehicleOut); + //推送金蝶上装销售出库单 + SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut); + finKingDeeFeign.draftSalOutStock(salOutStock); + List fEntity = salOutStock.getFEntity(); + for (SalOutStock.FEntity entity : fEntity) { + String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1); + if ("Z".equals(substring)) { + baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); + baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); + baseVehinstall.setSalesDate(DateUtil.formatDate(new Date())); + saveOrUpdate(baseVehinstall); + } + } + return rb.success(); + } - public ResultBean vehinstallOut(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseVehinstall baseVehinstall = fetchBySid(sid); - if (baseVehinstall.getVehicleStateKey().equals("0002")) { - return rb.setMsg("该挂车已出库"); - } - BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(),baseVehinstall.getCreateOrg()); - String vehicleState = baseVehicle.getVehicleState(); - if (!vehicleState.equals("0002")) { - return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); - } - BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid()); - BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); - BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid"); - baseVehicleOut.setTypeKey("003"); - baseVehicleOut.setType("上装挂车"); - String billNo = ""; - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date; - String i = baseMapper.selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - baseVehicleOut.setBillNo(billNo); - baseVehicleOut.setTrailerOrInstallMGroupCode("99.02"); - baseVehicleOut.setTrailerOrInstallMGroupName("挂车"); - baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); - baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid()); - baseVehicleOut.setTrailerOrInstallName("上装"); - BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid()); - String wk_long = baseVehinstallmodel.getWk_long(); - String wk_wide = baseVehinstallmodel.getWk_wide(); - String wk_high = baseVehinstallmodel.getWk_high(); - String installName = baseVehinstallmodel.getInstallNameValue(); - StringBuilder vehinstallmodel = new StringBuilder(); - vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")"); - baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString()); - baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice()); - //备注 - String remarks1 = createRemarks(baseVehicleOut); - String remarks2 = baseVehicleOut.getRemarks(); - String remarks3 = remarks2 + remarks1; - if ("null".equals(remarks3)) { - remarks3 = ""; - } - baseVehicleOut.setRemarks(remarks3); - BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); - baseVehicleOutApply.setBillNo(billNo); - baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate()); - baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid()); - baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName()); - baseVehicleOutApply.setMobile(baseVehicleOut.getMobile()); - baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid()); - baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName()); - baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid()); - baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName()); - baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid()); - baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName()); - baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd")); - baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey()); - baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType()); - baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid()); - baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid()); - //保存车辆出库单主表 - baseVehicleOutApplyService.save(baseVehicleOutApply); - //出库单子表关联主表sid - baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); - baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid()); - baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName()); - baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey()); - baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue()); - //保存车辆出库单子表 - baseVehicleOutService.save(baseVehicleOut); - //推送金蝶上装销售出库单 - SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut); - finKingDeeFeign.draftSalOutStock(salOutStock); - List fEntity = salOutStock.getFEntity(); - for (SalOutStock.FEntity entity : fEntity) { - String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1); - if ("Z".equals(substring)) { - baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); - baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); - baseVehinstall.setSalesDate(DateUtil.formatDate(new Date())); - saveOrUpdate(baseVehinstall); - } - } - return rb.success(); - } + private String createRemarks(BaseVehicleOut baseVehicleOut) { + String note = ""; + if (StringUtils.isNotBlank(baseVehicleOut.getMiddleOne())) { + if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { + if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { + if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { + note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "," + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。"; + } else { + note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; + } - private String createRemarks(BaseVehicleOut baseVehicleOut) { - String note = ""; - if (StringUtils.isNotBlank(baseVehicleOut.getMiddleOne())) { - if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { - if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { - if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { - note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "," + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。"; - } else { - note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; - } + } else { + if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { + note = note + " 返利情况：" + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。"; + } + } - } else { - if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { - note = note + " 返利情况：" + baseVehicleOut.getMiddleTwo() + baseVehicleOut.getRebateMoneyTwo() + "。"; - } - } + } else { + if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { + note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; + } + } + } else { + if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { + if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { + note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; + } + } + } + return note; + } - } else { - if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyOne().toString())) { - note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; - } - } - } else { - if (StringUtils.isNotBlank(baseVehicleOut.getMiddleTwo())) { - if (StringUtils.isNotBlank(baseVehicleOut.getRebateMoneyTwo().toString())) { - note = note + " 返利情况：" + baseVehicleOut.getMiddleOne() + baseVehicleOut.getRebateMoneyOne() + "。"; - } - } - } - return note; - } + private SalOutStock createSzOrGcSalOutStock(BaseVehinstall baseVehinstall, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) { + SalOutStock salOutStock = new SalOutStock(); + //单据编号 + salOutStock.setFBillNo(baseVehicleOut.getBillNo()); + //日期 + salOutStock.setFDate(DateUtil.today()); + //分公司id + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode()); + //客户 + salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo()); + //销售部门id + String orgDeptSid = baseVehicleOut.getOrgSid(); + ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + salOutStock.setF_PAEZ_AssistantType("payType"); + //销售类型-外采挂车映射 + salOutStock.setF_PAEZ_AssistantKey("009"); + //物料列表 + List fEntityList = new ArrayList<>(); + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + fEntity.setFPrice(baseVehicleOut.getTrailerOrInstallDealPrice()); + //物料编码 + fEntity.setFMaterialID(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); + //仓库id + fEntity.setFStockID("ARZSCK"); + fEntityList.add(fEntity); + if (fEntityList.size() > 0) { + salOutStock.setFEntity(fEntityList); + return salOutStock; + } else { + return null; + } + } - private SalOutStock createSzOrGcSalOutStock(BaseVehinstall baseVehinstall, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) { - SalOutStock salOutStock = new SalOutStock(); - //单据编号 - salOutStock.setFBillNo(baseVehicleOut.getBillNo()); - //日期 - salOutStock.setFDate(DateUtil.today()); - //分公司id - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); - salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode()); - //客户 - salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo()); - //销售部门id - String orgDeptSid = baseVehicleOut.getOrgSid(); - ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); - if (resultBean.getSuccess()) { - SysOrganizationVo vo = resultBean.getData(); - if (vo != null) { - salOutStock.setFSaleDeptID(vo.getOrgCode()); - } - } - //项目类别key和项目类别type - salOutStock.setF_PAEZ_AssistantType("payType"); - //销售类型-外采挂车映射 - salOutStock.setF_PAEZ_AssistantKey("009"); - //物料列表 - List fEntityList = new ArrayList<>(); - SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); - //单价 - fEntity.setFPrice(baseVehicleOut.getTrailerOrInstallDealPrice()); - //物料编码 - fEntity.setFMaterialID(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); - //仓库id - fEntity.setFStockID("ARZSCK"); - fEntityList.add(fEntity); - if (fEntityList.size() > 0) { - salOutStock.setFEntity(fEntityList); - return salOutStock; - } else { - return null; - } - } + private SalOutStock createSzOrGcSalOutStockNew(BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut, BaseVehicleOutApply baseVehicleOutApply) { + SalOutStock salOutStock = new SalOutStock(); + //单据编号 + salOutStock.setFBillNo(baseVehicleOutApply.getBillNo()); + //日期 + salOutStock.setFDate(DateUtil.today()); + //分公司id + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode()); + //客户 + salOutStock.setFCustomerID(baseVehicleOutApply.getContractNo()); + //销售部门id + String orgDeptSid = baseVehicleOutApply.getOrgSid(); + ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + salOutStock.setF_PAEZ_AssistantType("payType"); + //销售类型-外采挂车映射 + salOutStock.setF_PAEZ_AssistantKey("009"); + //物料列表 + List fEntityList = new ArrayList<>(); + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + fEntity.setFPrice(baseVehicleOut.getPrice().toString()); + //物料编码 + fEntity.setFMaterialID(baseVehicleOut.getMaterialCode()); + //仓库id + fEntity.setFStockID("ARZSCK"); + fEntityList.add(fEntity); + salOutStock.setFEntity(fEntityList); + return salOutStock; + } - public ResultBean vehinstallOutNew(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseVehinstall baseVehinstall = fetchBySid(sid); - if (baseVehinstall.getVehicleStateKey().equals("0002")) { - return rb.setMsg("该挂车已出库"); - } - BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(),baseVehinstall.getCreateOrg()); - String vehicleState = baseVehicle.getVehicleState(); - if (!vehicleState.equals("0002")) { - return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); - } - BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid()); - BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); - BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid"); - baseVehicleOut.setTypeKey("003"); - baseVehicleOut.setType("上装挂车"); - String billNo = ""; - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date; - String i = baseMapper.selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - baseVehicleOut.setBillNo(billNo); - baseVehicleOut.setTrailerOrInstallMGroupCode("99.02"); - baseVehicleOut.setTrailerOrInstallMGroupName("挂车"); - baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ"); - baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid()); - baseVehicleOut.setTrailerOrInstallName("上装"); - BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid()); - String wk_long = baseVehinstallmodel.getWk_long(); - String wk_wide = baseVehinstallmodel.getWk_wide(); - String wk_high = baseVehinstallmodel.getWk_high(); - String installName = baseVehinstallmodel.getInstallNameValue(); - StringBuilder vehinstallmodel = new StringBuilder(); - vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")"); - baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString()); - baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice()); - //备注 - String remarks1 = createRemarks(baseVehicleOut); - String remarks2 = baseVehicleOut.getRemarks(); - String remarks3 = remarks2 + remarks1; - if ("null".equals(remarks3)) { - remarks3 = ""; - } - baseVehicleOut.setRemarks(remarks3); - BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); - baseVehicleOutApply.setBillNo(billNo); - baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate()); - baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid()); - baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName()); - baseVehicleOutApply.setMobile(baseVehicleOut.getMobile()); - baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid()); - baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName()); - baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid()); - baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName()); - baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid()); - baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName()); - baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd")); - baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey()); - baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType()); - baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid()); - baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid()); - //保存车辆出库单主表 - baseVehicleOutApplyService.save(baseVehicleOutApply); - //出库单子表关联主表sid - baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); - baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid()); - baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName()); - baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey()); - baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue()); - //保存车辆出库单子表 - baseVehicleOutService.save(baseVehicleOut); - //推送金蝶上装销售出库单 - SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut); - finKingDeeFeign.draftSalOutStock(salOutStock); - List fEntity = salOutStock.getFEntity(); - for (SalOutStock.FEntity entity : fEntity) { - String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1); - if ("Z".equals(substring)) { - baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); - baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); - baseVehinstall.setSalesDate(DateUtil.formatDate(new Date())); - saveOrUpdate(baseVehinstall); - } - } - return rb.success(); - } + public ResultBean vehinstallOutNew(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehinstall baseVehinstall = fetchBySid(sid); + if (baseVehinstall.getVehicleStateKey().equals("0002")) { + return rb.setMsg("该挂车已出库"); + } + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(), baseVehinstall.getCreateOrg()); + String vehicleState = baseVehicle.getVehicleState(); + if (!vehicleState.equals("0002")) { + return rb.setMsg("此主车车辆库存状态不是出库，请重新选择"); + } + //生成单据编号 + String billNo = ""; + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid()); + BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOutDetailsVo.getMainSid()); + //出库主表信息录入 + baseVehicleOutApply.setSid(UUID.randomUUID().toString()); + baseVehicleOutApply.setBillNo(billNo); + //保存车辆出库单主表 + baseVehicleOutApplyService.save(baseVehicleOutApply); + BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); + baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid()); + baseVehicleOut.setZcMGroupCode("99.02"); + baseVehicleOut.setZcMGroupName("挂车"); + baseVehicleOut.setVinSid(baseVehicle.getSid()); + baseVehicleOut.setPrice(new BigDecimal(baseVehinstall.getGuidePrice())); + //出库单子表关联主表sid + baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); + baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey()); + baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue()); + baseVehicleOut.setMaterialCode(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8) + "SZ"); + baseVehicleOut.setMaterialName("上装"); + baseVehicleOut.setMaterialTypeKey("003"); + baseVehicleOut.setMaterialTypeValue("上装"); + baseVehicleOut.setMaterialSid(baseVehinstall.getSid()); + //保存车辆出库单子表 + baseVehicleOutService.save(baseVehicleOut); + //推送金蝶上装销售出库单 + SalOutStock salOutStock = createSzOrGcSalOutStockNew(baseVehicle, baseVehicleOut, baseVehicleOutApply); + finKingDeeFeign.draftSalOutStock(salOutStock); + List fEntity = salOutStock.getFEntity(); + for (SalOutStock.FEntity entity : fEntity) { + baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); + baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); + baseVehinstall.setSalesDate(DateUtil.formatDate(new Date())); + saveOrUpdate(baseVehinstall); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 25c7bebe7b..43de630f3e 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -1161,16 +1161,10 @@ public class CrmCustomerTempService extends MybatisBaseService qyAppFetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid); - if (finCompanyInvoicingDetailsVo != null) { + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getSid())) { return rb.success().setData(finCompanyInvoicingDetailsVo); } CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData(); + if (crmCustomerTempVo == null){ + return rb.setMsg("该开票名称不存在，请重新选择"); + } finCompanyInvoicingDetailsVo.setSid(crmCustomerTempVo.getSid()); finCompanyInvoicingDetailsVo.setName(crmCustomerTempVo.getName()); finCompanyInvoicingDetailsVo.setPhone(crmCustomerTempVo.getMobile()); finCompanyInvoicingDetailsVo.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid()); + finCompanyInvoicingDetailsVo.setCreateBySid(crmCustomerTempVo.getCreateBySid()); + finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid()); return rb.success().setData(finCompanyInvoicingDetailsVo); } } \ No newline at end of file From e589254cfb6afa2c4371c55d0ffb69c1addf5efe Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 31 May 2023 16:28:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyFeign.java | 5 + ...ArrearsCarryVehicleApplyFeignFallback.java | 5 + .../BusArrearsCarryVehicleApplyRest.java | 5 + .../BusArrearsCarryVehicleApplyService.java | 164 +- .../src/main/resources/ftl/gd2.ftl | 12 +- .../src/main/resources/ftl/qktcApply.ftl | 2365 +++++++++++++++++ 6 files changed, 2552 insertions(+), 4 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 56e2f5d7ef..99b31bb750 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -163,6 +163,11 @@ public interface BusArrearsCarryVehicleApplyFeign { @ResponseBody ResultBean createPdfFile(@RequestParam("sid")String sid); + @ApiOperation(value = "欠款提车申请打印pdf") + @GetMapping(value = "/printApplyPdf") + @ResponseBody + ResultBean printApplyPdf(@RequestParam("sid")String sid); + diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 7978b0ecf4..1d0d083d00 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -161,4 +161,9 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry public ResultBean createPdfFile(String sid) { return null; } + + @Override + public ResultBean printApplyPdf(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index cd556364c5..8c013fc6eb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -253,5 +253,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.createPdfFile(sid); } + @Override + public ResultBean printApplyPdf(String sid) { + return busArrearsCarryVehicleApplyService.printApplyPdf(sid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 8854ac708e..ade985b1d1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -72,6 +72,7 @@ import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.Base64; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.TransformMoney; import com.yxt.common.base.utils.WordConvertUtils; @@ -88,9 +89,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.io.InputStream; +import java.io.*; import java.math.BigDecimal; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -801,7 +804,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService printApplyPdf(String sid) { + ResultBean rb = ResultBean.fireFail(); + Map map = new HashMap<>(); + ResultBean resultBean = details(sid); + if(!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(sid); + AppArrearsCarryInfoVo appArrearsCarryInfoVo = resultBean.getData(); + map.put("applyName",appArrearsCarryInfoVo.getApplyName()); + map.put("applyDept",appArrearsCarryInfoVo.getApplyDept()); + map.put("createDate",appArrearsCarryInfoVo.getCreateDate()); + map.put("staffName",appArrearsCarryInfoVo.getStaffName()); + map.put("staffDeptName",appArrearsCarryInfoVo.getStaffDept()); + map.put("paymentMethod",appArrearsCarryInfoVo.getPaymentMethod()); + map.put("contractId",appArrearsCarryInfoVo.getContractId()); + map.put("openTickName",appArrearsCarryInfoVo.getOpenTickName()); + map.put("customerName",appArrearsCarryInfoVo.getCustomerName()); + map.put("modelName",appArrearsCarryInfoVo.getModelName()); + map.put("isFinance",appArrearsCarryInfoVo.getIsFinance()); + List adCarListVoList = appArrearsCarryInfoVo.getVinList(); + map.put("adCarListVoList",adCarListVoList); + map.put("reasonValue",appArrearsCarryInfoVo.getReasonValue()); + map.put("reason",appArrearsCarryInfoVo.getReason()); + map.put("contractMoney",appArrearsCarryInfoVo.getContractMoney()); + map.put("contractCollectionMoney",appArrearsCarryInfoVo.getContractCollectionMoney()); + map.put("commitmentMoneyDate",appArrearsCarryInfoVo.getCommitmentMoneyDate()); + List carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(",")); + List carContractList = new ArrayList<>(); + for (String image : carContract) { + try { + image = fileUploadComponent.getUrlPrefix()+URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + carContractList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + map.put("carContractList",carContractList); + List guaranteeLetter = Arrays.asList(busArrearsCarryVehicleApply.getGuaranteeLetterFile().split(",")); + List guaranteeLetterList = new ArrayList<>(); + for (String image : guaranteeLetter) { + try { + image = fileUploadComponent.getUrlPrefix()+URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + guaranteeLetterList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + map.put("guaranteeLetterList",guaranteeLetterList); + List gdLetter = Arrays.asList(busArrearsCarryVehicleApply.getGdLetterFile().split(",")); + List gdLetterList = new ArrayList<>(); + for (String image : gdLetter) { + try { + image = fileUploadComponent.getUrlPrefix()+URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + gdLetterList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + map.put("gdLetterList",gdLetterList); + List zjlLetter = Arrays.asList(busArrearsCarryVehicleApply.getZjlLetterFile().split(",")); + List zjlLetterList = new ArrayList<>(); + for (String image : zjlLetter) { + try { + image = fileUploadComponent.getUrlPrefix()+URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + zjlLetterList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + map.put("zjlLetterList",zjlLetterList); + List fileList = Arrays.asList(busArrearsCarryVehicleApply.getOtherFile().split(",")); + List fileListList = new ArrayList<>(); + for (String image : fileList) { + try { + image = fileUploadComponent.getUrlPrefix()+URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + fileListList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + map.put("fileListList",fileListList); + String url = ""; + String ftl = "qktcApply"; + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成合同文件名 + String pdfName = "欠款提车审批单_" +appArrearsCarryInfoVo.getContractId() + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + url = pdfName; + return rb.success().setData(url); + } + + public static String image2Base64(String imgUrl) { + URL url = null; + InputStream is = null; + ByteArrayOutputStream outStream = null; + HttpURLConnection httpUrl = null; + try { + url = new URL(imgUrl); + httpUrl = (HttpURLConnection) url.openConnection(); + httpUrl.connect(); + httpUrl.getInputStream(); + is = httpUrl.getInputStream(); + outStream = new ByteArrayOutputStream(); + //创建一个Buffer字符串 + byte[] buffer = new byte[1024]; + //每次读取的字符串长度，如果为-1，代表全部读取完毕 + int len = 0; + //使用一个输入流从buffer里把数据读取出来 + while ((len = is.read(buffer)) != -1) { + //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度 + outStream.write(buffer, 0, len); + } + // 对字节数组Base64编码 + return Base64.encode(outStream.toByteArray()); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (outStream != null) { + try { + outStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (httpUrl != null) { + httpUrl.disconnect(); + } + } + return imgUrl; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl index a52f599e00..61243e232d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl @@ -1237,7 +1237,17 @@ - + + + + + + + + + + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl new file mode 100644 index 0000000000..3ef03e80e3 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl @@ -0,0 +1,2365 @@ + + + + + 孟哲 底 + 孟哲 底 + 2 + 0 + 2023-05-31T06:42:00Z + 2023-05-31T06:42:00Z + 3 + 77 + 444 + 3 + 1 + 520 + 16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 欠款提车申请单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发起人 + + + + + + + + + + + + + + + + + + + + + + + + ${applyName!} + + + + + + + + + + + + + + + + + + + + + + + + + 发起部门 + + + + + + + + + + + + + + + + + + + + + + + + ${applyDept!} + + + + + + + + + + + + + + + + + + + + + + + + + 发起日期 + + + + + + + + + + + + + + + + + + + + + + + ${createDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + 销售专员 + + + + + + + + + + + + + + + + + + + + + + + + ${staffName!} + + + + + + + + + + + + + + + + + + + + + + + + + 销售部门 + + + + + + + + + + + + + + + + + + ${staffDeptName!} + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型 + + + + + + + + + + + + + + + + + + + + + + + + + + ${paymentMethod!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractId!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 开票单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${openTickName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是否金融部复核 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${isFinance!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆信息 + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + 成交价 + + + + + + + + + + + + + + + + + + + + + 平台已收款 + + + + + <#list adCarListVoList as list> + + + + + + + + + + + + + + + + + + + + + + ${list_index} + + + + + + + + + + + + + + + + + + + + + + + + ${list.vin!} + + + + + + + + + + + + + + + + + + + + + + + + ${list.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.subscribedAll!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 欠款提车原因 + + + + + + + + + + + + + + + + + + + + + + + + ${reasonValue!} + + + + + + + + + + + + + + + + + + + + + + + + ${reason!} + + + + + + + + + + + + + + + + + + + + + + 合同总金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractMoney!} + + + + + + + + + + + + + + + + + + + + + + + 平台收款总金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractCollectionMoney!} + + + + + + + + + + + + + + + + + + + + + + + + 承诺回款日期 + + + + + + + + + + + + + + + + + + + + + + + + + + ${commitmentMoneyDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + 车辆买卖合同（欠款） + + + + + <#list carContractList as carContract> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${carContract!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + 欠款提车担保承诺书 + + + + + <#list guaranteeLetterList as guaranteeLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${guaranteeLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 股东会对外担保协议 + + + + + <#list gdLetterList as gdLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${gdLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 总经理担保书 + + + + + <#list zjlLetterList as zjlLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${zjlLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 其他附件（含资方信审照片） + + + + + <#list fileListList as fileList> + + + + + + + + + + + + + + + + + + + + + + + + + ${fileList!} + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0078814ac039777e7d0ac45bc95efeb97fcc6330 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 31 May 2023 17:15:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index ade985b1d1..b66950c2ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -2481,7 +2481,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = appArrearsCarryInfoVo.getVinList(); map.put("adCarListVoList",adCarListVoList); map.put("reasonValue",appArrearsCarryInfoVo.getReasonValue()); From db1c651fb1d0711175ea29d7a823956ff2313a80 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 31 May 2023 17:16:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/ftl/qktcApply.ftl | 32 +- .../src/main/resources/ftl/qktcApplyOld.ftl | 2365 +++++++++++++++++ 2 files changed, 2381 insertions(+), 16 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApplyOld.ftl diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl index 3ef03e80e3..470e793529 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl @@ -1665,7 +1665,7 @@ - ${list_index} + ${list_index+1} @@ -2063,10 +2063,10 @@ - ${carContract!} - ${carContract!} + - + @@ -2136,10 +2136,10 @@ - ${guaranteeLetter!} - ${guaranteeLetter!} + - + @@ -2202,10 +2202,10 @@ - ${gdLetter!} - ${gdLetter!} + - + @@ -2268,10 +2268,10 @@ - ${zjlLetter!} - ${zjlLetter!} + - + @@ -2334,10 +2334,10 @@ - ${fileList!} - ${fileList!} + - + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApplyOld.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApplyOld.ftl new file mode 100644 index 0000000000..bab8c85a97 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApplyOld.ftl @@ -0,0 +1,2365 @@ + + + + + 孟哲 底 + 孟哲 底 + 2 + 0 + 2023-05-31T06:42:00Z + 2023-05-31T06:42:00Z + 3 + 77 + 444 + 3 + 1 + 520 + 16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 欠款提车申请单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发起人 + + + + + + + + + + + + + + + + + + + + + + + + ${applyName!} + + + + + + + + + + + + + + + + + + + + + + + + + 发起部门 + + + + + + + + + + + + + + + + + + + + + + + + ${applyDept!} + + + + + + + + + + + + + + + + + + + + + + + + + 发起日期 + + + + + + + + + + + + + + + + + + + + + + + ${createDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + 销售专员 + + + + + + + + + + + + + + + + + + + + + + + + ${staffName!} + + + + + + + + + + + + + + + + + + + + + + + + + 销售部门 + + + + + + + + + + + + + + + + + + ${staffDeptName!} + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型 + + + + + + + + + + + + + + + + + + + + + + + + + + ${paymentMethod!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractId!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 开票单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${openTickName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是否金融部复核 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${isFinance!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆信息 + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + 成交价 + + + + + + + + + + + + + + + + + + + + + 平台已收款 + + + + + <#list adCarListVoList as list> + + + + + + + + + + + + + + + + + + + + + + ${list_index+1} + + + + + + + + + + + + + + + + + + + + + + + + ${list.vin!} + + + + + + + + + + + + + + + + + + + + + + + + ${list.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.subscribedAll!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 欠款提车原因 + + + + + + + + + + + + + + + + + + + + + + + + ${reasonValue!} + + + + + + + + + + + + + + + + + + + + + + + + ${reason!} + + + + + + + + + + + + + + + + + + + + + + 合同总金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractMoney!} + + + + + + + + + + + + + + + + + + + + + + + 平台收款总金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractCollectionMoney!} + + + + + + + + + + + + + + + + + + + + + + + + 承诺回款日期 + + + + + + + + + + + + + + + + + + + + + + + + + + ${commitmentMoneyDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + 车辆买卖合同（欠款） + + + + + <#list carContractList as carContract> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${carContract!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + 欠款提车担保承诺书 + + + + + <#list guaranteeLetterList as guaranteeLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${guaranteeLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 股东会对外担保协议 + + + + + <#list gdLetterList as gdLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${gdLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 总经理担保书 + + + + + <#list zjlLetterList as zjlLetter> + + + + + + + + + + + + + + + + + + + + + + + + + ${zjlLetter!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 其他附件（含资方信审照片） + + + + + <#list fileListList as fileList> + + + + + + + + + + + + + + + + + + + + + + + + + ${fileList!} + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d690ad209dff5b6569b167a0617fee63395693ad Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 1 Jun 2023 09:20:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E4=BA=A4=E5=A4=87=E6=B3=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finvehicleinvoice/FinVehicleInvoice.java | 2 ++ .../FinVehicleInvoiceDetailsVo.java | 16 +++++++++++----- .../finvehicleinvoice/FinVehicleInvoiceDto.java | 3 ++- .../FinVehicleInvoiceMapper.xml | 4 +++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java index 1ac77f9abe..02267b25eb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java @@ -149,4 +149,6 @@ public class FinVehicleInvoice extends BaseEntity { private String isTakeTicket; @ApiModelProperty("开票人") private String drawer; + @ApiModelProperty("移交备注") + private String transferRemarks; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 903f3cba76..2453ecb2ab 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -62,13 +62,10 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private String openingBank; @ApiModelProperty("银行账号") private String bankNum; - @ApiModelProperty("接收人") - private String recipient; + @ApiModelProperty("接收人sid") private String recipientSid; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @ApiModelProperty("移交日期") - private Date transferTime; + @ApiModelProperty("纳税人识别号") private String taxpayerNo; @ApiModelProperty("图片地址集合") @@ -86,5 +83,14 @@ public class FinVehicleInvoiceDetailsVo implements Vo { @ApiModelProperty("业务状态") private String businessState; + @ApiModelProperty("接收人") + private String recipient; + @ApiModelProperty("接收日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date transferTime; + @ApiModelProperty("移交备注") + private String transferRemarks; + @ApiModelProperty("移交状态") + private String transferState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java index 35396d0bd6..26d2e1291b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java @@ -125,5 +125,6 @@ public class FinVehicleInvoiceDto implements Dto { private String isTakeTicket; @ApiModelProperty("开票人") private String drawer; - + @ApiModelProperty("移交备注") + private String transferRemarks; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 5157cee4d4..576b70f48b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -182,7 +182,9 @@ v.transferTime, v.bankNum, v.taxpayerNo, - v.isTakeTicket + v.isTakeTicket, + v.transferRemarks, + v.transferState FROM fin_vehicle_invoice AS v LEFT JOIN anrui_portal.sys_user AS u ON v.createBySid = u.sid LEFT JOIN anrui_portal.sys_staffinfo AS si ON u.staffSid = si.sid