Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
85e79b4caa
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
  2. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java
  5. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
  6. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  7. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  8. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  9. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  10. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java
  11. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  12. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
  13. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/DownloadUrlVo.java
  14. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java
  15. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  16. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java
  17. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
  18. 137
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  19. 49
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  20. 44
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  21. 26
      anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue
  22. 16
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue
  23. 25
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue
  24. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue
  25. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue
  26. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue
  27. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  28. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  29. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  30. 22
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/PrivilegeQuery.java
  31. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java
  32. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
  33. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
  34. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
  35. 18
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
  36. 8
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
  37. 11
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
  38. 93
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  39. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java
  40. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java
  41. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java
  42. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java
  43. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java
  44. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml
  45. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java
  46. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
  47. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue
  48. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhangInfo.vue
  49. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
  50. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderQuery.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@ -128,4 +128,8 @@ public class BaseVehicleOut extends BaseEntity {
private String materialTypeValue;
@ApiModelProperty("物料sid")
private String materialSid;
@ApiModelProperty("实际购车人电话")
private String realityBuyCarPhone;
@ApiModelProperty("实际购车人姓名")
private String realityBuyCarName;
}

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java

@ -18,8 +18,8 @@ public class BaseVehicleOutDetailsNewVo implements Vo {
private String materialName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("物料类型")
private String materialTypeValue;
@ApiModelProperty("销售类型")
private String type;
@ApiModelProperty("销售部门名称")
private String orgName;
@ApiModelProperty("销售专员")
@ -30,8 +30,10 @@ public class BaseVehicleOutDetailsNewVo implements Vo {
private String price;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("实际购车人")
private String buyerTypeValue;
@ApiModelProperty("实际购车人电话")
private String realityBuyCarPhone;
@ApiModelProperty("实际购车人名称")
private String realityBuyCarName;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java

@ -60,5 +60,9 @@ public class BaseVehicleZSOutDto implements Dto {
@ApiModelProperty("物料sid")
private String materialSid;
@ApiModelProperty("财务中客户编码")
private String cwCustomerNo; // 财务中客户编码
private String cwCustomerNo;
@ApiModelProperty("实际购车人电话")
private String realityBuyCarPhone;
@ApiModelProperty("实际购车人姓名")
private String realityBuyCarName;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java

@ -106,4 +106,9 @@ public class BaseVehicleOutApply extends BaseEntity {
private String cwCustomerNo; // 财务中客户编码
@ApiModelProperty("业务sid(出库申请sid、挂车/上装单独出库sid)")
private String busSid; // 业务sid(出库申请sid、挂车/上装单独出库sid)
@ApiModelProperty("实际购车人电话")
private String buyerTypeKey;
@ApiModelProperty("实际购车人姓名")
private String buyerTypeValue;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@ -74,8 +74,10 @@ public class BaseVehicleOutApplyVoNew implements Vo {
private String staffName;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("实际购车人")
private String buyerTypeValue;
@ApiModelProperty("实际购车人电话")
private String realityBuyCarPhone;
@ApiModelProperty("实际购车人名称")
private String realityBuyCarName;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号码")

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@ -173,13 +173,14 @@
SELECT bvo.`materialCode`,
bvo.`materialName`,
bvo.vinNo,
bvo.`materialTypeValue`,
bvoa.`saleTypeValue` AS `type`,
bvoa.orgName,
bvoa.`staffName`,
bvoa.saleDate,
bvo.`price`,
bvoa.`contractNo` as concatNo,
bvoa.`buyerTypeValue`,
bvo.`realityBuyCarPhone`,
bvo.`realityBuyCarName`,
bvoa.`customerName`,
bvoa.`mobile`,
bvo.`giftsDescription`,

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -1422,7 +1422,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOutApply.setCustomerNo(baseVehicleZSOutApplyDto.getCustomerNo());
//baseVehicleOutApply.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOutApply.setBusSid(baseVehicleZSOutApplyDto.getBusSid());
baseVehicleOutApply.setIsTerminal(baseVehicleZSOutApplyDto.getBuyerTypeValue());
baseVehicleOutApply.setBuyerTypeKey(baseVehicleZSOutApplyDto.getBuyerTypeKey());
baseVehicleOutApply.setBuyerTypeValue(baseVehicleZSOutApplyDto.getBuyerTypeValue());
//保存车辆出库单主表
baseVehicleOutApplyService.save(baseVehicleOutApply);
//出库类型是否为全款车(001全款车)
@ -1496,7 +1497,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleZSOutDto.setMaterialTypeKey("002");
baseVehicleZSOutDto.setMaterialTypeValue("挂车");
baseVehicleZSOutDto.setVinSid(baseTrailerVo.getVehSid());
baseVehicleZSOutDto.setVinNo(baseTrailerVo.getZcvinNo());
baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
gcOrSzDtos.add(baseVehicleZSOutDto);
}
} else {
@ -1510,7 +1511,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleZSOutDto.setMaterialTypeKey("003");
baseVehicleZSOutDto.setMaterialTypeValue("上装");
baseVehicleZSOutDto.setVinSid(dto.getVinSid());
baseVehicleZSOutDto.setVinNo(dto.getMaterialCode());
gcOrSzDtos.add(baseVehicleZSOutDto);
}
}
@ -1812,6 +1812,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
public ResultBean<BaseVehicleOutDetailsNewVo> detailsNew(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleOutDetailsNewVo baseVehicleOutDetailsNewVo = baseMapper.detailsNew(sid);
baseVehicleOutDetailsNewVo.setRealityBuyCarName(baseVehicleOutDetailsNewVo.getRealityBuyCarName() + baseVehicleOutDetailsNewVo.getRealityBuyCarPhone());
return rb.success().setData(baseVehicleOutDetailsNewVo);
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -17,7 +17,8 @@
bvoa.`orgName`,
bvoa.`staffName`,
bvoa.`contractNo` AS concatNo,
bvoa.buyerTypeValue,
bvo.realityBuyCarPhone,
bvo.realityBuyCarName,
bvoa.customerName,
bvoa.mobile,
bvo.materialName,

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -111,6 +111,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
if (StringUtils.isNotBlank(params.getOrgSid())) {
qw.eq("bvoa.createOrgSid", params.getOrgSid());
}
qw.orderByDesc("bvoa.saleDate");
}
return qw;
}
@ -124,6 +125,10 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
String createOrgSid = record.getCreateOrgSid();
String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
record.setCreateOrgName(createorgName);
if (!"主车".equals(record.getMaterialName())){
record.setModelName("");
record.setInsideCode("");
}
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
return p;

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@ -124,6 +124,7 @@ public class AppArrearsCarryInfoVo implements Vo {
private String guaranteeLetterDownloadUrl;
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String allDownloadUrl;
@ApiModelProperty("组织全路径")
private String orgPath;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@ -101,7 +101,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ApiOperation("点击生成附件")
@PostMapping("/saveArrearsApplyPdf")
@ResponseBody
public ResultBean saveArrearsApplyPdf(@Valid @RequestBody AppArrearsCarryDto dto);
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(@Valid @RequestBody AppArrearsCarryDto dto);
@ApiOperation("手机端-删除欠款提车")
@DeleteMapping("/deleteArrearsTakeCar")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@ -97,7 +97,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
}
@Override
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
return null;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/DownloadUrlVo.java

@ -20,4 +20,6 @@ public class DownloadUrlVo {
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String sid;
@ApiModelProperty("整体附件下载地址")
private String allDownloadUrl;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java

@ -23,6 +23,7 @@ public enum BuscenterFileEnum {
GUARANTEELETTER_DOWNLOADURL("014", "欠款提车担保承诺书"),
GDLETTER_DOWNLOADURL("015", "股东会对外担保决议"),
ZJLLETTER_DOWNLOADURL("016", "总经理担保书"),
TCALL_DOWNLOADURL("018", "欠款提车附件"),
DISCOUNTPACKAGE_HANDOVER("017","优惠包交接确认")
;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -280,7 +280,7 @@ public interface BusSalesOrderFeign {
@ResponseBody
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<OrderQuery> pq);
@ApiOperation("App销售订单根据组织机构查询")
@ApiOperation("销售订单查询")
@GetMapping("/selectBySid")
@ResponseBody
ResultBean<BusSalesOrder> selectBySid(@RequestParam("businessSid") String businessSid);

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java

@ -1,7 +1,9 @@
package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Author dimengzhe
@ -15,4 +17,10 @@ public class OrderQuery implements Query {
private String orgPath;
private String name;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("菜单url")
private String menuUrl;
@ApiModelProperty("用户sid")
private String userSid;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@ -183,7 +183,7 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
}
@Override
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
return busArrearsCarryVehicleApplyService.saveArrearsApplyPdf(dto);
}

137
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -689,6 +689,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getCarContractFile())) {
List<String> carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(","));
carContract = carContract.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
@ -784,6 +788,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
String guaranteeLetterDownloadUrl = "";
String zjlLetterDownloadUrl = "";
String gdLetterDownloadUrl = "";
String allDownloadUrl = "";
//新增生成附件(新车买卖合同(欠款)、欠款提车担保承诺书、总经理担保承诺书、股东会对外担保决议)
//车架号发生变化,重新生成新车买卖合同(欠款)、欠款提车担保承诺书、总经理担保承诺书、
//回购日期发生变化,重新生成欠款提车担保承诺书
@ -797,34 +802,60 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//生成股东会对外担保决议
gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
PdfVo pdfVo = new PdfVo();
List<File> filesList = new ArrayList<>();
if(StringUtils.isNotBlank(carContractDownloadUrl)){
pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
pdfVo.setDownUrl(carContractDownloadUrl);
list.add(pdfVo);
// pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(carContractDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(gdLetterDownloadUrl)){
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(gdLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(gdLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(zjlLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(zjlLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
String urlAll = "";
if (filesList.size() > 0) {
String typeName = "欠款提车附件" + ".pdf";
try {
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
pdfVo.setType(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.TCALL_DOWNLOADURL.getMark());
list.add(pdfVo);
}
@ -873,34 +904,61 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
//新车买卖合同(欠款)
PdfVo pdfVo = new PdfVo();
List<File> filesList = new ArrayList<>();
if (StringUtils.isNotBlank(carContractDownloadUrl)) {
pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
pdfVo.setDownUrl(carContractDownloadUrl);
list.add(pdfVo);
// pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(carContractDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if (StringUtils.isNotBlank(gdLetterDownloadUrl)) {
//股东会对外担保决议
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(gdLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(gdLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
//总经理担保书
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(zjlLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(zjlLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
//欠款提车担保承诺书
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
String urlAll = "";
if (filesList.size() > 0) {
String typeName = "欠款提车附件" + ".pdf";
try {
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
pdfVo.setType(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.TCALL_DOWNLOADURL.getMark());
pdfVo.setDownUrl(urlAll);
list.add(pdfVo);
}
}
@ -2088,8 +2146,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
ResultBean rb = ResultBean.fireFail();
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
ResultBean<DownloadUrlVo> rb = ResultBean.fireFail();
DownloadUrlVo downloadUrlVo = new DownloadUrlVo();
ResultBean<CreatePdfVo> resultBean = saveArrearsApply(dto);
if (!resultBean.getSuccess()) {
@ -2112,6 +2170,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType().equals(pdfVo.getType())) {
downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
}
if(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType().equals(pdfVo.getType())){
downloadUrlVo.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
}
}
if (resultBean.getData().isChange() || resultBean.getData().isDateChange()) {
return rb.success().setData(downloadUrlVo).setMsg("附件已发生变化,可下载最新附件");
@ -2195,6 +2256,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getCarContractFile())) {
List<String> carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(","));
carContract = carContract.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());

49
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -62,6 +62,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverFeign;
import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
@ -180,6 +182,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private BaseMiddlemanFeign baseMiddlemanFeign;
@Autowired
private BaseVehicleOutFeign baseVehicleOutFeign;
@Autowired
private BusVehicleInformationHandoverFeign busVehicleInformationHandoverFeign;
/**
* 构造出库申请的查询条件
@ -658,6 +662,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
Future future3 = pool.submit(() -> {
pushOutApply(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
});
Future future4 = pool.submit(() -> {
pushVehicleInforHandov(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
});
} catch (Exception e) {
e.printStackTrace();
log.error("推送数据失败=========================" + e.getMessage());
@ -681,6 +688,42 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
}
/**
* 推送随车资料
* @param busDeliveredApply
* @param detailsList
* @param data
* @param data1
*/
private void pushVehicleInforHandov(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList, AppOrderDetailsVo data, SysUserVo data1) {
if(!detailsList.isEmpty()){
for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
BusVehicleInformationHandoverDto dto = new BusVehicleInformationHandoverDto();
dto.setBusSid(busDeliveredApplyDetails.getSid());
dto.setCreateBySid(busDeliveredApply.getCreateBySid());
dto.setVinNo(busDeliveredApplyDetails.getVinNo());
dto.setVehicleSid(busDeliveredApplyDetails.getVinSid());
if ("1".equals(busDeliveredApply.getPaymentMethodKey())) {
dto.setCustomerName(busDeliveredApply.getName());
} else {
dto.setCustomerName(busDeliveredApply.getLoanName());
}
dto.setModel(busDeliveredApply.getModelName());
dto.setModelSid(busDeliveredApply.getModelSid());
dto.setContractNo(busDeliveredApply.getContractNo());
dto.setRecName(busDeliveredApply.getStaffName());
dto.setRecPhone(data1.getMobile());
dto.setUseOrgSid(busDeliveredApply.getUseOrgSid());
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid());
if (organizationVoResultBean.getData() != null) {
dto.setUseOrgName(organizationVoResultBean.getData().getName());
}
busVehicleInformationHandoverFeign.saveOrUpdate(dto);
}
}
}
/**
* 出库办理后推送开票
*
@ -870,6 +913,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
//主车
BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
//查询实际购车人
BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
if(busDeliveredUseMessage != null){
baseVehicleZSOutDto.setRealityBuyCarName(busDeliveredUseMessage.getName());
baseVehicleZSOutDto.setRealityBuyCarPhone(busDeliveredUseMessage.getMobile());
}
baseVehicleZSOutDto.setVinSid(busDeliveredApplyDetails.getVinSid());
baseVehicleZSOutDto.setVinNo(busDeliveredApplyDetails.getVinNo());
baseVehicleZSOutDto.setPrice(busDeliveredApply.getPrice());

44
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -147,6 +147,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
@ -5593,9 +5594,48 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
OrderQuery pagerQuery = pq.getParams();
QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
String orgSidPath = pagerQuery.getOrgPath();
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bo.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("bo.createBySid",pagerQuery.getUserSid());
}else{
PagerVo<AppBusSalesOrderVo> p = new PagerVo<>();
return p;
}
}else{
PagerVo<AppBusSalesOrderVo> p = new PagerVo<>();
return p;
}
//=======================
/* String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = sysOrganizationFeign.selectByCJOrgPath(orgSidPath).getData();
qw.like("bo.orgSidPath", orgSidPath);
qw.like("bo.orgSidPath", orgSidPath);*/
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
for (AppBusSalesOrderVo record : pagging.getRecords()) {

26
anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue

@ -167,44 +167,43 @@
</el-row>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若车辆列表信息或承诺回款日期需要修改请在修改后点击生成附件按钮重新生成相关附件</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleCreate()">生成附件</el-button>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成附件</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载附件</el-button>
</div>
</div>
<div class="title titleOne">
<div>
<span class="icon">*</span>车辆买卖合同(欠款)
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.carContractDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>欠款提车担保承诺书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.guaranteeLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>股东会对外担保决议</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.gdLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>总经理担保书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.zjlLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
@ -313,7 +312,8 @@ export default {
userSid: '',
vinList: [],
zjlLetter: [],
zjlLetterDownloadUrl: ''
zjlLetterDownloadUrl: '',
allDownloadUrl: ''
},
rules: {
isFinance: [{ required: true, message: '是否金融部复核请选择是或否', trigger: 'change' }],
@ -475,10 +475,7 @@ export default {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.carContractDownloadUrl = res.data.carContractDownloadUrl
this.formobj.gdLetterDownloadUrl = res.data.gdLetterDownloadUrl
this.formobj.guaranteeLetterDownloadUrl = res.data.guaranteeLetterDownloadUrl
this.formobj.zjlLetterDownloadUrl = res.data.zjlLetterDownloadUrl
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
@ -648,7 +645,8 @@ export default {
userSid: '',
vinList: [],
zjlLetter: [],
zjlLetterDownloadUrl: ''
zjlLetterDownloadUrl: '',
allDownloadUrl: ''
}
this.image_list1 = []
this.image_list2 = []

16
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue

@ -148,41 +148,40 @@
</el-col>
</el-row>
<div class="title titleOne">
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载附件</el-button>
</div>
<div class="title">
<div>
<span class="icon">*</span>车辆买卖合同(欠款)
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.carContractDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>欠款提车担保承诺书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.guaranteeLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>股东会对外担保决议</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.gdLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>总经理担保书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.zjlLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
@ -300,7 +299,8 @@ export default {
userSid: '',
vinList: [],
zjlLetter: [],
zjlLetterDownloadUrl: ''
zjlLetterDownloadUrl: '',
allDownloadUrl: ''
},
rules: {},
operation: '', //

25
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue

@ -166,44 +166,43 @@
</el-row>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若车辆列表信息或承诺回款日期需要修改请在修改后点击生成附件按钮重新生成相关附件</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleCreate()">生成附件</el-button>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成附件</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载附件</el-button>
</div>
</div>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>车辆买卖合同(欠款)
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.carContractDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>欠款提车担保承诺书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.guaranteeLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>股东会对外担保决议</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.gdLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>
<span class="icon">*</span>总经理担保书
</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.zjlLetterDownloadUrl)">下载附件</el-button>
</div>
<el-row>
<el-col :span="24">
@ -312,7 +311,8 @@ export default {
userSid: '',
vinList: [],
zjlLetter: [],
zjlLetterDownloadUrl: ''
zjlLetterDownloadUrl: '',
allDownloadUrl: ''
},
rules: {
isFinance: [{ required: true, message: '是否金融部复核请选择是或否', trigger: 'change' }],
@ -473,10 +473,7 @@ export default {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.carContractDownloadUrl = res.data.carContractDownloadUrl
this.formobj.gdLetterDownloadUrl = res.data.gdLetterDownloadUrl
this.formobj.guaranteeLetterDownloadUrl = res.data.guaranteeLetterDownloadUrl
this.formobj.zjlLetterDownloadUrl = res.data.zjlLetterDownloadUrl
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@ -149,7 +149,7 @@
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
<span>{{ scope.row.invoiceInfo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center" width="120">

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@ -149,7 +149,7 @@
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
<span>{{ scope.row.invoiceInfo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center" width="120">

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@ -147,7 +147,7 @@
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
<span>{{ scope.row.invoiceInfo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center" width="120">

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -590,8 +590,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
if (finVehicleInvoice == null) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -626,8 +626,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
if (finVehicleInvoice == null) {
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -1817,8 +1817,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
if (finVehicleInvoice == null) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -1853,8 +1853,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
if (finVehicleInvoice == null) {
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@ -49,4 +49,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
List<FinVehicleInvoice> selectBybillingSid(@Param("billingSid") String billingSid);
@Select("SELECT COUNT(*) FROM fin_vehicle_invoice WHERE vehicleSid = #{vinSid}")
int selectCountByVinSid(String vehSid);
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -371,4 +371,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
}
return rb.success();
}
public int selectCountByVinSid(String vehSid) {
return baseMapper.selectCountByVinSid(vehSid);
}
}

22
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/PrivilegeQuery.java

@ -0,0 +1,22 @@
package com.yxt.anrui.portal.api.sysuser;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 权限角色层级
* @author: dimengzhe
* @date: 2023/5/23
**/
@Data
public class PrivilegeQuery {
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("销售订单sid")
private String userSid;
}

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java

@ -21,4 +21,6 @@ public class SysMenuRoleVoList implements Vo {
private String roleType;
@ApiModelProperty("角色层级value")
private String roleTypeValue;
@ApiModelProperty("权限id")
private int dataRuleId;
}

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@ -256,4 +256,8 @@ public interface SysUserFeign {
@PostMapping(value = "/shareSelectUser")
ResultBean<List<String>> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery);
@ApiOperation(value = "查询角色权限的层级获取权限id")
@PostMapping(value = "/selectPrivilegeLevel")
ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@ -235,4 +235,9 @@ public class SysUserFeignFallback implements SysUserFeign {
public ResultBean<List<String>> shareSelectUser(ShareUserQuery shareUserQuery) {
return null;
}
@Override
public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
return null;
}
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java

@ -64,4 +64,8 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
List<SysMenuRoleVoList> selectRoleList(String menuSid);
List<SysMenuRoleVoList> selectMobileRoleList(String menuSid);
List<String> selectByRole(@Param("orgLevelKey") String orgLevelKey, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
List<String> selectByMobileRole(@Param("orgLevelKey") String orgLevelKey, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
}

18
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml

@ -92,7 +92,7 @@
</select>
<select id="selectRoleList" resultType="com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList">
select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue
select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId
from sys_role sr
left join sys_menu_role smr on sr.sid = smr.roleSid
where smr.menuSid = #{menuSid}
@ -104,4 +104,20 @@
left join sys_mobile_menu_role smr on sr.sid = smr.roleSid
where smr.menuSid = #{menuSid}
</select>
<select id="selectByRole" resultType="java.lang.String">
select dataRuleId from sys_menu_role smr
left join sys_menu sm on sm.sid = smr.menuSid
left join sys_role sr on sr.sid = smr.roleSid
left join sys_user_role sur on sur.roleSid = smr.roleSid
where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.roleType = #{orgLevelKey} order by dataRuleId asc
</select>
<select id="selectByMobileRole" resultType="java.lang.String">
select dataRuleId from sys_mobile_menu_role smr
left join sys_mobile_menu sm on sm.sid = smr.menuSid
left join sys_role sr on sr.sid = smr.roleSid
left join sys_user_role sur on sur.roleSid = smr.roleSid
where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.roleType = #{orgLevelKey} order by dataRuleId asc
</select>
</mapper>

8
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java

@ -177,4 +177,12 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
public List<SysMenuRoleVoList> selectMobileRoleList(String menuSid) {
return baseMapper.selectMobileRoleList(menuSid);
}
public List<String> selectByRole(String orgLevelKey, String menuSid,String userSid) {
return baseMapper.selectByRole(orgLevelKey,menuSid,userSid);
}
public List<String> selectByMobileRole(String orgLevelKey, String menuSid, String userSid) {
return baseMapper.selectByMobileRole(orgLevelKey,menuSid,userSid);
}
}

11
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@ -575,7 +575,7 @@ public class SysUserRest implements SysUserFeign {
@Override
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid);
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid);
if (sysUserInfoVo == null) {
return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门");
}
@ -626,8 +626,8 @@ public class SysUserRest implements SysUserFeign {
}
@Override
public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid,String orgPath) {
return sysUserService.selectSysUserList(userSid,orgPath);
public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid, String orgPath) {
return sysUserService.selectSysUserList(userSid, orgPath);
}
@Override
@ -654,4 +654,9 @@ public class SysUserRest implements SysUserFeign {
public ResultBean<List<String>> shareSelectUser(ShareUserQuery shareUserQuery) {
return sysUserService.shareSelectUser(shareUserQuery);
}
@Override
public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
return sysUserService.selectPrivilegeLevel(query);
}
}

93
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -463,14 +463,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
String deptSid = "";
if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
List<String> split = Arrays.asList(vv.getOrgSidPath().split("/"));
if(split.size()>1){
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2));
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1));
orgName = sysOrganization.getName()+"/"+sysOrganization1.getName();
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2));
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1));
orgName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
}else{
} else {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
orgName = sysOrganization.getName();
deptName = sysOrganization.getName();
@ -1300,12 +1300,12 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
String orgName = "";
if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
List<String> split = Arrays.asList(vv.getOrgSidPath().split("/"));
if(split.size()>1){
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2));
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1));
orgName = sysOrganization.getName()+"/"+sysOrganization1.getName();
}else{
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2));
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1));
orgName = sysOrganization.getName() + "/" + sysOrganization1.getName();
} else {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
orgName = sysOrganization.getName();
}
@ -1352,19 +1352,19 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
ResultBean<List<SysUserVo>> rb = ResultBean.fireFail();
List<String> roleSids = userQuery.getRoleSids();
String orgSidPath = userQuery.getOrgSidPath();
List<SysUserVo> list=new ArrayList<>();
for(String s:roleSids){
UserQuery uq=new UserQuery();
List<SysUserVo> list = new ArrayList<>();
for (String s : roleSids) {
UserQuery uq = new UserQuery();
uq.setRoleSid(s);
uq.setOrgSidPath(orgSidPath);
ResultBean<List<SysUserVo>> userByRole = getUserByRole(uq);
if(userByRole.getSuccess()){
if (userByRole.getSuccess()) {
List<SysUserVo> data = userByRole.getData();
data.forEach( f->{
data.forEach(f -> {
list.add(f);
});
}else{
log.error("角色获取人员--s:"+userByRole.getMsg());
} else {
log.error("角色获取人员--s:" + userByRole.getMsg());
}
}
return rb.success().setData(list);
@ -1378,7 +1378,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
//部门list
List<String> orgList = shareUserQuery.getOrgSids();
//查询该部门下子集部门的人员以及该部门下的人员
if(orgList != null && orgList.size()>0){
if (orgList != null && orgList.size() > 0) {
for (int i = 0; i < orgList.size(); i++) {
String orgSid = orgList.get(i);
//查询该部门下的所有人员以及查询该部门的子集下的所有人员
@ -1386,12 +1386,65 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
staffList.addAll(staffSidList);
}
}
if(memberList != null && memberList.size()>0){
if (memberList != null && memberList.size() > 0) {
staffList.addAll(memberList);
}
//去重
staffList=staffList.stream().distinct().collect(Collectors.toList());
staffList = staffList.stream().distinct().collect(Collectors.toList());
List<String> userSidList = baseMapper.selectUserByStaffSid(staffList);
return rb.success().setData(userSidList);
}
public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
String defalutId = "";
if (StringUtils.isBlank(query.getMenuSid())) {
//根据菜单路由查询菜单的sid
List<SysMenu> sysMenuList = sysMenuService.selectByMenuUrl(query.getMenuUrl());
if (sysMenuList.size() > 1) {
return rb.setMsg("当前菜单的路由存在多个,请联系管理员");
} else if (sysMenuList.size() == 0) {
return rb.setMsg("当前菜单不存在");
} else {
String menuSid = sysMenuList.get(0).getSid();
//根据层级查找角色
List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
//最后一级的sid所属层级
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));
//查询层级对应的角色权限id
List<String> roleSid = sysRoleService.selectByRole(sysOrganization.getOrgLevelKey(), menuSid,query.getUserSid());
roleSid.removeAll(Collections.singleton(null));
if (!roleSid.isEmpty()) {
for (int i = 0; i < roleSid.size(); i++) {
if (StringUtils.isNotBlank(roleSid.get(i))) {
defalutId = roleSid.get(i);
break;
} else {
continue;
}
}
}
}
} else {
String menuSid = query.getMenuSid();
//根据层级查找角色
List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
//最后一级的sid所属层级
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));
//查询层级对应的角色权限id
List<String> roleSid = sysRoleService.selectByMobileRole(sysOrganization.getOrgLevelKey(), menuSid,query.getUserSid());
roleSid.removeAll(Collections.singleton(null));
if (!roleSid.isEmpty()) {
for (int i = 0; i < roleSid.size(); i++) {
if (StringUtils.isNotBlank(roleSid.get(i))) {
defalutId = roleSid.get(i);
break;
} else {
continue;
}
}
}
}
return rb.success().setData(defalutId);
}
}

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java

@ -0,0 +1,15 @@
package com.yxt.anrui.scm.api.scmwarehouse;
import lombok.Data;
/**
* @description: 说明
* @author: dimengzhe
* @date: 2023/5/24
**/
@Data
public class ScmExtra {
private String name;
private String sid;
}

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.scm.api.scmwarehouse;
import lombok.Data;
/**
* @description: 仓库相关
* @author: dimengzhe
* @date: 2023/5/24
**/
@Data
public class ScmWarVo {
private String id;
private String dictValue;
private ScmExtra extra;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@ -73,6 +73,10 @@ public interface ScmWarehouseFeign {
@GetMapping(value = "/selectWarehouseByUserSid")
public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@SpringQueryMap AppScmWarehouseQuery appScmWarehouseQuery);
@ApiOperation("手机端-获取仓库新")
@GetMapping(value = "/selectWarehouseByUserSidOne")
public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam(value = "search",required = false) String search);
@ApiOperation("巡检获取仓库管理人")
@GetMapping("/selectByAddressSid/{addressSid}")
public ResultBean<ScmWarehouseVo> selectByAddressSid(@PathVariable("addressSid") String addressSid);

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@ -79,6 +79,11 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
return null;
}
@Override
public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
return null;
}
@Override
public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
return null;

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java

@ -26,16 +26,16 @@
package com.yxt.anrui.scm.biz.scmwarehouse;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmwarehouse.AppScmWarehouseVo;
import com.yxt.common.core.result.ResultBean;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarVo;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import java.util.List;
import java.util.Map;
@ -69,6 +69,7 @@ public interface ScmWarehouseMapper extends BaseMapper<ScmWarehouse> {
List<Map<String, String>> fetchByUseOrgSid(String sid);
List<AppScmWarehouseVo> selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid);
List<ScmWarVo> selectWarehouseByUserSidOne(@Param("useOrgSid") String useOrgSid,@Param("search") String search);
@Select("select * from scm_warehouse where sid =#{addressSid}")
ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid);

11
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml

@ -27,4 +27,15 @@
FROM scm_warehouse
WHERE useOrgSid = #{useOrgSid}
</select>
<select id="selectWarehouseByUserSidOne" resultType="com.yxt.anrui.scm.api.scmwarehouse.ScmWarVo">
SELECT sid,
sid as id,
warehouseName as dictValue
FROM scm_warehouse
WHERE useOrgSid = #{useOrgSid}
<if test="search != null and search != ''">
AND warehouseName LIKE concat('%', #{search}, '%')
</if>
</select>
</mapper>

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@ -117,6 +117,11 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery);
}
@Override
public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
return scmWarehouseService.selectWarehouseByUserSidOne(userSid,orgPath,search);
}
@Override
public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
return scmWarehouseService.selectByAddressSid(addressSid);

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -22,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -203,4 +202,26 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
public ScmWarehouseVo selectByGressionCode(String useOrgSid) {
return baseMapper.selectByGressionCode(useOrgSid);
}
public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
ResultBean<List<ScmWarVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
List<ScmWarVo> list = baseMapper.selectWarehouseByUserSidOne(orgPath,search);
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
ScmWarVo scmWarVo = list.get(i);
ScmExtra scmExtra = new ScmExtra();
scmExtra.setSid(scmWarVo.getId());
scmExtra.setName(scmWarVo.getDictValue());
scmWarVo.setExtra(scmExtra);
}
}
return rb.success().setData(list);
}
}

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@ -137,7 +137,7 @@
</el-table-column>
<el-table-column label="实际购车人" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.buyerTypeValue }}</span>
<span>{{ scope.row.realityBuyCarName }}</span>
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="100">

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhangInfo.vue

@ -91,7 +91,7 @@
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.buyerTypeValue }}</span>
<span>{{ temp.realityBuyCarName }}</span>
</el-form-item>
</el-col>
</el-row>

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@ -133,6 +133,8 @@ public class AdvanceArrearsInfoVo implements Vo {
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String allDownloadUrl;
@ApiModelProperty("组织全路径")
private String orgPath;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderQuery.java

@ -21,4 +21,6 @@ public class BusOrderQuery implements Query {
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
}

Loading…
Cancel
Save