yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
wangpengfei 2 weeks ago
parent
05dd698a0c f58f1f0ead
commit
93b9b574ed
24 changed files with 559 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  3. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  4. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  5. 83
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  6. 10
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
  7. 10
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
  8. 12
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java
  9. 2
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
  10. 23
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java
  11. 28
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java
  12. 12
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
  13. 26
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
  14. 10
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java
  15. 35
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
  16. 24
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
  17. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
  18. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java
  19. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  20. 3
      anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
  21. 10
      doc/databases/统计报表/车辆利润报表.sql
  22. 248
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
  23. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java
  24. 59
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
View File

@ -117,8 +117,8 @@ public interface BusVehicleApplyFeign {
@ResponseBody
ResultBean<BusVehicleApply> getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode);
@ApiOperation("rePushFin")
@PostMapping("/排产已办结没有推送财务出纳")
@PostMapping("rePushFin")
@ApiOperation("/排产已办结没有推送财务出纳")
@ResponseBody
ResultBean rePushFin(@RequestParam("sid")String sid);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
View File

@ -39,6 +39,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -138,4 +139,8 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
List<BaseVehinstall> selectInstall(String linkNo);
LoanHomevisitInvestigateCustomer getHomeVisitCustomerInfo(@Param("sid") String sid,@Param("loanSid") String loanSid);
ScmVehicleGression selectByLocationAndVin(@Param("locationSid") String locationSid, @Param("vinSid") String sid);
int selectCOuntByScmSid(String sid);
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
View File

@ -241,4 +241,14 @@
left join anrui_riskcenter.loan_homevisit_investigate_customer lc on lc.mainSid = li.sid
where li.saleOrderSid = #{sid} and li.saleOrderBorrowerSid = #{loanSid}
</select>
<select id="selectByLocationAndVin" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression">
select sg.* from anrui_scm.scm_vehicle_gression sg
left join anrui_scm.scm_vehicle_gression_veh svgv on svgv.mainSid = sg.sid
where sg.locationSid = #{locationSid} and svgv.vehSid = #{vinSid} order by sg.id desc limit 1
</select>
<select id="selectCOuntByScmSid" resultType="int">
select count(*) from scm_vehicle_gression_veh where mainSid = #{sid}
</select>
</mapper>

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
View File

@ -36,10 +36,7 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -335,4 +332,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
public ResultBean<String> saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
return busDeliveredApplyService.saveRetrievalApplyInfo(appDeliveredApplyDto);
}
@PostMapping("pushReport")
@ApiOperation("测试推送车辆利润报表")
ResultBean pushReport(@RequestParam("sid")String sid){
return busDeliveredApplyService.pushReport(sid);
}
}

83
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -79,6 +79,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@ -99,6 +100,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
import com.yxt.anrui.buscenter.biz.bussalesorderloancontract.BusSalesOrderLoancontractService;
import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService;
@ -137,6 +139,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
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.sysparameter.SysParameterFeign;
@ -154,8 +157,12 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvest
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
@ -178,6 +185,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
@ -307,6 +315,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Autowired
private CarsSoldProfitFeign carsSoldProfitFeign;
@Autowired
private BusSalesOrderSubmitService busSalesOrderSubmitService;
/**
* 构造出库申请的查询条件
@ -1189,10 +1199,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
Future future10 = pool.submit(() -> {
pushOtherDocument(busDeliveredApply, detailsList);
});
/* Future future13 = pool.submit(() -> {
Future future13 = pool.submit(() -> {
//推送车辆利润报表
pushCarSoldProfit(busDeliveredApply, detailsList);
});*/
});
//推送单车返利管理
String concatNo = busDeliveredApply.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderService.selectOrderByContractNo(concatNo).getData();
@ -1379,7 +1389,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private void pushCarSoldProfit(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList) {
List<CarsSoldProfitDto> dtoList = new ArrayList<>();
detailsList.removeAll(Collections.singleton(null));
if(!detailsList.isEmpty()){
if (!detailsList.isEmpty()) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
@ -1390,7 +1400,29 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
carsSoldProfitDto.setCustomerSid(busSalesOrder.getCustomerSid());
carsSoldProfitDto.setCustomerName(busSalesOrder.getCustomerName());
//金融服务费
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if (detailsVoResultBean.getData() != null) {
SolutionsDetailsVo solutionsDetailsVo = detailsVoResultBean.getData();
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
carsSoldProfitDto.setFinanceServiceCharge(solutionsDetailsVo.getServiceAmount());
}
}
//中介返利
BigDecimal zjAll = BigDecimal.ZERO;
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid());
String zjReturnPrice = "";
boolean isShow = false;
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
if (busSalesOrderSubmit.getDistributorPrice() != null) {
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice());
}
}
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorNameTwo())) {
if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo());
}
}
carsSoldProfitDto.setMediatorRebatePrice(zjAll.toString());
//车辆台账中取
carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath());
@ -1400,13 +1432,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//销售日期
carsSoldProfitDto.setSaleDate(baseVehicle.getSalesDate());
//车架号
carsSoldProfitDto.setVinNo(baseVehicle.getVinNo());
carsSoldProfitDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
carsSoldProfitDto.setVinSid(baseVehicle.getSid());
//车型
carsSoldProfitDto.setVehModelSid(baseVehicle.getModelSid());
carsSoldProfitDto.setVehMConfigSid(baseVehicle.getModelConfigSid());
//采购系统
carsSoldProfitDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
carsSoldProfitDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
//入库价
carsSoldProfitDto.setCostPrice(baseVehicle.getCostPrice().toString());
//出库价
carsSoldProfitDto.setExStockPrice(baseVehicle.getContractPrice().toString());
//存放地点
@ -1414,25 +1449,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
carsSoldProfitDto.setLocationName(baseVehicle.getLocationName());
//厂家结算价
carsSoldProfitDto.setMakersSettlementPrice(baseVehicle.getSettlePrice().toString());
//排产订单编号
//变速箱
carsSoldProfitDto.setSchedulingId(baseVehicle.getOrderingNo());
//数据日期
carsSoldProfitDto.setCreateDate(new Date());
//事业部
List<String> stringList = Arrays.asList(carsSoldProfitDto.getOrgSidPath().split("/"));
String busSid = stringList.get(1);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(busSid).getData();
carsSoldProfitDto.setDivision(sysOrganization.getName());
carsSoldProfitDto.setDivisionSid(busSid);
dtoList.add(carsSoldProfitDto);
//查询存放地点变更的申请经费以及台数
ScmVehicleGression scmVehicleGression = baseMapper.selectByLocationAndVin(carsSoldProfitDto.getLocationSid(),baseVehicle.getSid());
if(scmVehicleGression != null){
BigDecimal allMon = BigDecimal.ZERO;
String applicantFunds = scmVehicleGression.getApplicantFunds();
int vount = baseMapper.selectCOuntByScmSid(scmVehicleGression.getSid());
if(StringUtils.isNotBlank(applicantFunds) && new BigDecimal(applicantFunds).compareTo(BigDecimal.ZERO)>0){
allMon = new BigDecimal(applicantFunds).divide(new BigDecimal(vount),2, RoundingMode.HALF_UP);
}
carsSoldProfitDto.setMoveCarPrice(allMon.toString());
}
}
}
if(!dtoList.isEmpty()){
if (!dtoList.isEmpty()) {
ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList);
}
}
@ -5313,4 +5354,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
public String selCustomerByBusVinSid(String busVinSid) {
return baseMapper.selCustomerByBusVinSid(busVinSid);
}
public ResultBean pushReport(String sid) {
ResultBean rb = ResultBean.fireFail();
BusDeliveredApply busDeliveredApply = fetchBySid(sid);
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
pushCarSoldProfit(busDeliveredApply,detailsList);
return rb.success();
}
}

10
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
View File

@ -47,8 +47,6 @@ public class CarsSoldProfit extends BaseEntity {
private String locationSid;
@ApiModelProperty("存放地点")
private String locationName;
@ApiModelProperty("采购类型")
private String type;
@ApiModelProperty("出库价")
private BigDecimal exStockPrice;
@ApiModelProperty("预计毛利")
@ -71,10 +69,14 @@ public class CarsSoldProfit extends BaseEntity {
private BigDecimal moveCarPrice;
@ApiModelProperty("排产订单编号")
private String schedulingId;
@ApiModelProperty("变速箱")
private String gearbox;
@ApiModelProperty("数据日期")
private Date createDate;
@ApiModelProperty("更新日期")
private Date updateDate;
@ApiModelProperty("入库价")
private BigDecimal costPrice;
@ApiModelProperty("事业部")
private String division;
private String divisionSid;
}

10
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
View File

@ -45,8 +45,6 @@ public class CarsSoldProfitDto {
private String locationSid;
@ApiModelProperty("存放地点")
private String locationName;
@ApiModelProperty("采购类型")
private String type;
@ApiModelProperty("出库价")
private String exStockPrice;
@ApiModelProperty("预计毛利")
@ -69,10 +67,14 @@ public class CarsSoldProfitDto {
private String moveCarPrice;
@ApiModelProperty("排产订单编号")
private String schedulingId;
@ApiModelProperty("变速箱")
private String gearbox;
@ApiModelProperty("数据日期")
private Date createDate;
@ApiModelProperty("更新日期")
private Date updateDate;
private String costPrice;
@ApiModelProperty("事业部")
private String division;
private String divisionSid;
}

12
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java
View File

@ -4,10 +4,9 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -25,9 +24,16 @@ public interface CarsSoldProfitFeign {
@PostMapping("saveOrUpdate")
@ResponseBody
@ApiOperation("保存或修改")
ResultBean saveOrUpdate(@RequestBody List<CarsSoldProfitDto> dtoList);
@PostMapping("list")
@ResponseBody
@ApiOperation("车辆利润报表分页")
ResultBean<PagerVo<CarsSoldProfitVo>> list(@RequestBody PagerQuery<CarsSoldProfitQuery> pagerQuery);
@GetMapping("rebates")
@ResponseBody
@ApiOperation("返利明细")
ResultBean<CarsSoldProfitRebateAllVo> rebates(@RequestParam("sid")String sid);
}

2
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
View File

@ -15,7 +15,7 @@ public class CarsSoldProfitQuery implements Query {
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("机构组织全路径")
private String orgSidPath;
private String orgPath;
@ApiModelProperty("搜索分公司、车架号、车型、排产订单、销售专员")
private String names;

23
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java
View File

@ -0,0 +1,23 @@
package com.yxt.anrui.reportcenter.api.carsSoldProfit;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/15
**/
@Data
public class CarsSoldProfitRebateAllVo implements Vo {
private static final long serialVersionUID = -9016391824372444422L;
private List<CarsSoldProfitRebateDetailsVo> list;
@ApiModelProperty("预提返利合计")
private String expectedRebateTotal;
@ApiModelProperty("调整返利合计")
private String adjustedRebateTotal;
}

28
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java
View File

@ -0,0 +1,28 @@
package com.yxt.anrui.reportcenter.api.carsSoldProfit;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/15
**/
@Data
public class CarsSoldProfitRebateDetailsVo implements Vo {
private static final long serialVersionUID = -2059450221052046209L;
@ApiModelProperty("政策方")
private String policy;
@ApiModelProperty("所属年月")
private String yearAndMonth;
@ApiModelProperty("返利类型")
private String rebateType;
@ApiModelProperty("返利名称")
private String rebateName;
@ApiModelProperty("预提返利")
private String expectedRebate;
@ApiModelProperty("返利调整")
private String rebatesAdjust;
}

12
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
View File

@ -27,7 +27,8 @@ public class CarsSoldProfitVo {
@ApiModelProperty("事业部")
private String division;
@ApiModelProperty("车型")
private String model;
@JsonProperty("model")
private String vehicleAlias;
@ApiModelProperty("采购系统")
@JsonProperty("buySystem")
@ -58,14 +59,17 @@ public class CarsSoldProfitVo {
private String moveCarPrice;
@ApiModelProperty("变速箱")
private String gearbox;
@JsonProperty("gearbox")
private String gearboxTypeValue;
@ApiModelProperty("排产订单编号")
private String schedulingId;
@ApiModelProperty("数据日期")
private String dataTime;
@JsonProperty("dataTime")
private String createDate;
@ApiModelProperty("更新日期")
private String updateTime;
@JsonProperty("updateTime")
private String updateDate;
private String sid;
}

26
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
View File

@ -3,12 +3,34 @@
<mapper namespace="com.yxt.anrui.reportcenter.biz.carsSoldProfit.CarsSoldProfitMapper">
<select id="selectByVinSid" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit">
select *
from cars_sole_profit
from cars_sold_profit
where vinSid = #{vinSid}
</select>
<select id="listPage" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo">
select * from cars_sole_profit
select cp.staffName,
cp.customerName,
DATE_FORMAT(cp.saleDate,'%Y-%m-%d') as saleDate,
cp.useOrgName,
cp.division,
cp.purchaseSystemName,
cp.vinNo,
cp.exStockPrice,
cp.expectedMaori,
cp.rebatesAdjust,
cp.adjustedMaori,
cp.makersSettlementPrice,
cp.rebatesTotal,
cp.carCost,
cp.financeServiceCharge,
cp.mediatorRebatePrice,
cp.schedulingId,
cp.createDate,
cp.updateDate,
bm.gearboxTypeValue,
bm.vehicleAlias
from cars_sold_profit cp
left join anrui_base.base_vehicle_model bm on bm.sid = cp.vehModelSid
<where>
${ew.sqlSegment}
</where>

10
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java
View File

@ -1,9 +1,6 @@
package com.yxt.anrui.reportcenter.biz.carsSoldProfit;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.*;
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -39,4 +36,9 @@ public class CarsSoldProfitRest implements CarsSoldProfitFeign {
PagerVo<CarsSoldProfitVo> pv = carsSoldProfitService.listPage(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<CarsSoldProfitRebateAllVo> rebates(String sid) {
return carsSoldProfitService.rebates(sid);
}
}

35
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
View File

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -74,13 +71,13 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
if (StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
@ -89,16 +86,16 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("cp.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("cp.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("cp.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("cp.orgSidPath", orgSidPath);
} else {
PagerVo<CarsSoldProfitVo> p = new PagerVo<>();
return p;
@ -113,21 +110,21 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
String[] s = date.split("至");
String startDate = s[0];
if (StringUtils.isNotBlank(startDate)) {
qw.ge("saleDate", startDate);
qw.ge("cp.saleDate", startDate);
}
String endDate = s[1];
if (StringUtils.isNotBlank(endDate)) {
qw.le("saleDate", endDate);
qw.le("cp.saleDate", endDate);
}
}
String names = query.getNames();
// 多字段模糊查询
if (StringUtils.isNotBlank(names)) {
qw.and(wrapper -> wrapper.like("useOrgName", names)
.or().like("vinNo", names)
.or().like("model", names)
.or().like("schedulingId", names)
.or().like("staffName", names));
qw.and(wrapper -> wrapper.like("cp.useOrgName", names)
.or().like("cp.vinNo", names)
.or().like("bm.vehicleAlias", names)
.or().like("cp.schedulingId", names)
.or().like("cp.staffName", names));
}
@ -139,4 +136,8 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
PagerVo<CarsSoldProfitVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<CarsSoldProfitRebateAllVo> rebates(String sid) {
return null;
}
}

24
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
View File

@ -962,7 +962,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
if(all.compareTo(BigDecimal.ZERO)>0){//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售");
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -973,7 +973,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
if(loanDeposit.compareTo(BigDecimal.ZERO)>0){//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-贷款保证金抵顶");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-贷款保证金抵顶");
voucherResultDetailDtoJf.setSubjectNo("2182.01.01");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -984,7 +984,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
if(bxbzjMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-保险保证金抵顶");
voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆再次销售-保险保证金抵顶");
voucherResultDetailDtoJf2.setSubjectNo("2182.01.01");
//核算部门
voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
@ -995,7 +995,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
if(cssMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf3.setSummary("**扣回车辆再次销售-车损失");
voucherResultDetailDtoJf3.setSummary(customerNumber+"扣回车辆再次销售-车损失");
voucherResultDetailDtoJf3.setSubjectNo("1201.03.04.01");
//核算部门
voucherResultDetailDtoJf3.setDimensionDept(deptVo.getOrgCode());
@ -1007,7 +1007,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿
if(cssMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -1016,7 +1016,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
voucherResultDetailDtoDf.setCredit(cssMoney.toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -1027,7 +1027,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -1036,7 +1036,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -1141,7 +1141,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
//-------------------------------------------应收贷款车欠款_待处理欠款_扣回车辆
if (all.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoDf.setSummary("**扣回车辆赎回结转");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆赎回结转");
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -1153,7 +1153,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
//---------------------------------------------应收贷款车欠款_到期欠款_累欠
if (lqMoney.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoJf.setSummary("**扣回车辆赎回结转");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆赎回结转");
voucherResultDetailDtoJf.setSubjectNo("1201.02.03");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -1165,7 +1165,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
//--------------------------------------------应收贷款车欠款_未到期欠款_未到期欠款
if (wdqMoney.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoJf2.setSummary("**扣回车辆赎回结转");
voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆赎回结转");
voucherResultDetailDtoJf2.setSubjectNo("1201.01.00");
//核算部门
voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
@ -1177,7 +1177,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
//-------------------------------------------应收贷款车欠款_到期欠款_本金
if (bjMoney.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoJf3.setSummary("**扣回车辆赎回结转");
voucherResultDetailDtoJf3.setSummary(customerNumber+"扣回车辆赎回结转");
voucherResultDetailDtoJf3.setSubjectNo("1201.02.01");
//核算部门
voucherResultDetailDtoJf3.setDimensionDept(deptVo.getOrgCode());

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
View File

@ -703,7 +703,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
if(cssMoney.compareTo(BigDecimal.ZERO)>0){//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -712,7 +712,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
voucherResultDetailDtoDf.setCredit(cssMoney.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -723,7 +723,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
}
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -732,7 +732,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java
View File

@ -51,6 +51,8 @@ public class ScmVehRebateTypeStatVo implements Vo {
private BigDecimal adjustmentMoney;
@ApiModelProperty("未上传金额")
private BigDecimal notUploadMoney;
@ApiModelProperty("其中费用合计")
private BigDecimal moneyTotal;
@ApiModelProperty("预计支出费用")
private BigDecimal expectItureCost;
@ApiModelProperty("预计待支付费用")

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
View File

@ -311,6 +311,7 @@
'' AS expectItureCost,
SUM(r.expectTreatCost) AS expectTreatCost,
SUM(r.expectSuppCost) AS expectSuppCost,
SUM(r.expectTreatCost) + SUM(r.expectSuppCost) AS moneyTotal,
SUM(r.estimateRebate) - IFNULL(SUM(r.uploadMoney), 0) - IFNULL(SUM(r.secondaryUploadMoney), 0) + IFNULL(SUM(r.adjustmentMoney), 0) - SUM(r.expectTreatCost) - SUM(r.expectSuppCost) AS balance,
r.brandName,
r.useOrgName,
@ -343,6 +344,7 @@
SUM(r.expectItureCost) AS expectItureCost,
SUM(r.expectTreatCost) AS expectTreatCost,
SUM(r.expectSuppCost) AS expectSuppCost,
SUM(r.expectItureCost) + SUM(r.expectTreatCost) + SUM(r.expectSuppCost) AS moneyTotal,
SUM(r.estimateRebate) - IFNULL(SUM(r.uploadMoney), 0) - IFNULL(SUM(r.secondaryUploadMoney), 0) + IFNULL(SUM(r.adjustmentMoney), 0) - SUM(r.expectItureCost) - SUM(r.expectTreatCost) - SUM(r.expectSuppCost) AS balance,
r.brandName,
r.useOrgName,

3
anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
View File

@ -63,11 +63,12 @@
<el-table-column label="未上传" align="center">
<el-table-column prop="notUploadMoney" label="合计" align="center" width="120" />
<el-table-column label="其中费用" align="center">
<el-table-column prop="moneyTotal" label="合计" align="center" width="120" />
<el-table-column prop="expectItureCost" label="支出" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="待支付" align="center" width="120" />
<el-table-column prop="expectSuppCost" label="抵顶" align="center" width="120" />
</el-table-column>
<el-table-column prop="balance" label="剩余" align="center" width="120" />
<el-table-column prop="balance" label="其中返利" align="center" width="120" />
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />

10
doc/databases/统计报表/车辆利润报表.sql
View File

@ -1,5 +1,5 @@
DROP TABLE IF EXISTS `car_sold_profit`;
CREATE TABLE `car_sold_profit`
DROP TABLE IF EXISTS `cars_sold_profit`;
CREATE TABLE `cars_sold_profit`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
@ -20,8 +20,9 @@ CREATE TABLE `car_sold_profit`
`saleDate` varchar(64) DEFAULT NULL COMMENT '销售日期',
`useOrgSid` varchar(64) DEFAULT NULL COMMENT '分公司sid',
`useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司名称',
`division` varchar(64) DEFAULT NULL COMMENT '事业部名称',
`divisionSid` varchar(64) DEFAULT NULL COMMENT '事业部sid',
`vehModelSid` varchar(64) DEFAULT NULL COMMENT '车型sid',
`vehModel` varchar(64) DEFAULT NULL COMMENT '车型',
`vehMConfigSid` varchar(64) DEFAULT NULL COMMENT '车型配置sid',
`purchaseSystemSid` varchar(64) DEFAULT NULL COMMENT '采购系统sid',
`purchaseSystemName` varchar(64) DEFAULT NULL COMMENT '采购系统名称',
@ -29,7 +30,6 @@ CREATE TABLE `car_sold_profit`
`vinSid` varchar(200) DEFAULT NULL COMMENT '车辆sid',
`locationSid` varchar(200) DEFAULT NULL COMMENT '存放地点sid',
`locationName` varchar(200) DEFAULT NULL COMMENT '存放地点',
`type` varchar(200) DEFAULT NULL COMMENT '类型',
`exStockPrice` decimal(10, 2) DEFAULT NULL COMMENT '出库价',
`expectedMaori` decimal(10, 2) DEFAULT NULL COMMENT '预计毛利',
`rebatesAdjust` decimal(10, 2) DEFAULT NULL COMMENT '返利调整',
@ -40,8 +40,8 @@ CREATE TABLE `car_sold_profit`
`financeServiceCharge` decimal(10, 2) DEFAULT NULL COMMENT '金融服务费',
`mediatorRebatePrice` decimal(10, 2) DEFAULT NULL COMMENT '中介返利费',
`moveCarPrice` decimal(10, 2) DEFAULT NULL COMMENT '调车费',
`costPrice` decimal(10, 2) DEFAULT NULL COMMENT '入库价',
`schedulingId` varchar(500) DEFAULT NULL COMMENT '排产订单编号',
`gearbox` varchar(500) DEFAULT NULL COMMENT '变速箱',
`createDate` date DEFAULT NULL COMMENT '数据日期',
`updateDate` date DEFAULT NULL COMMENT '更新日期',
PRIMARY KEY (`id`),

248
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
View File

@ -28,6 +28,8 @@ import com.yxt.wms.feign.message.MessageFeign;
import com.yxt.wms.feign.message.MessageFlowVo;
import com.yxt.wms.feign.message.MessageFlowableQuery;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysflowpower.SysFlowNodeQuery;
import com.yxt.wms.feign.portal.sysflowpower.SysFlowPowerFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
@ -66,6 +68,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
private MessageFeign messageFeign;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private SysFlowPowerFeign sysFlowPowerFeign;
public PagerVo<WmsInventoryAllocateBillVoNew> listPageVo(PagerQuery<WmsInventoryAllocateBillQueryNew> pq) {
WmsInventoryAllocateBillQueryNew query = pq.getParams();
@ -646,6 +650,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//成本折扣价
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_9pm5umo8");
flowNodeQuery.setParameter("成本折扣价");
boolean f0 = false;
boolean f1 = false;
List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1){
break;
}
}
variables.put("iscdy",f0);
variables.put("isrdy",f1);
UserRoleQuery userRoleQuery = new UserRoleQuery();
if (list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")) {
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
@ -740,8 +772,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("iscdy", true);
variables.put("isrdy", true);
//成本折扣价
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_9pm5umo8");
flowNodeQuery.setParameter("成本折扣价");
boolean f0 = false;
boolean f1 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid);
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1){
break;
}
}
variables.put("iscdy",f0);
variables.put("isrdy",f1);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
@ -817,8 +875,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("iscdy", true);
variables.put("isrdy", true);
//成本折扣价
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_9pm5umo8");
flowNodeQuery.setParameter("成本折扣价");
boolean f0 = false;
boolean f1 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1){
break;
}
}
variables.put("iscdy",f0);
variables.put("isrdy",f1);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -838,8 +922,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("iscdy", true);
variables.put("isrdy", true);
//成本折扣价
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_9pm5umo8");
flowNodeQuery.setParameter("成本折扣价");
boolean f0 = false;
boolean f1 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1){
break;
}
}
variables.put("iscdy",f0);
variables.put("isrdy",f1);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -873,8 +983,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("iscdy", true);
variables.put("isrdy", true);
//成本折扣价
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_9pm5umo8");
flowNodeQuery.setParameter("成本折扣价");
boolean f0 = false;
boolean f1 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1){
break;
}
}
variables.put("iscdy",f0);
variables.put("isrdy",f1);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -939,7 +1075,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
variables.put("iscc", true);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
flowNodeQuery.setParameter("超出二级配件库存累计金额");
boolean f0 = false;
List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
flowNodeQuery.setNodeNames("合作二级站站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
variables.put("iscc",f0);
//用户的部门全路径sid
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
if (sysOrganization != null) {
@ -1009,7 +1162,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
variables.put("iscc", true);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
flowNodeQuery.setParameter("超出二级配件库存累计金额");
boolean f0 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid);
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("合作二级站站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
variables.put("iscc",f0);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
@ -1063,7 +1233,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
variables.put("iscc", true);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
flowNodeQuery.setParameter("超出二级配件库存累计金额");
boolean f0 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("合作二级站站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
variables.put("iscc",f0);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1084,7 +1271,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
variables.put("iscc", true);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
flowNodeQuery.setParameter("超出二级配件库存累计金额");
boolean f0 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("合作二级站站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
variables.put("iscc",f0);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1119,7 +1323,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
variables.put("iscc", true);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
flowNodeQuery.setParameter("超出二级配件库存累计金额");
boolean f0 = false;
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid);
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("合作二级站站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0){
break;
}
}
variables.put("iscc",f0);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -1149,7 +1370,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
} else {
messageFlowableQuery.setMsgContent(wmsInventoryAllocateBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("调拨申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();

21
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java
View File

@ -0,0 +1,21 @@
package com.yxt.wms.feign.portal.sysflowpower;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/11/27 14:49
*/
@Data
public class SysFlowNodeQuery {
private String flowName;//流程申请名称
private String createOrgName;//分公司
private String procDefId;//流程定义id
private String nodeNames;//环节名称
private String parameter;//参数名称
private String value;//值
private int type; //比较类型 0是否小于权限范围 1是否大于权限范围
}

59
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java
View File

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.feign.portal.sysflowpower;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* Project: anrui-portal(流程权限) <br/>
* File: SysFlowPowerFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign <br/>
* Description: 流程权限. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-27 14:31:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "流程权限")
@FeignClient(
contextId = "anrui-portal-SysFlowPower",
name = "anrui-portal",
path = "v1/sysflowpower")
public interface SysFlowPowerFeign {
@ApiOperation("审批权限校验")
@PostMapping("/flowPermissions")
public boolean flowPermissions(@RequestBody SysFlowNodeQuery query);
}
Write Preview
Loading…
Cancel
Save