Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 weeks ago
parent
commit
5db6b1fef2
  1. 20
      anrui-base/anrui-base-biz/pom.xml
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java
  4. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
  5. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  6. 113
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  7. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml
  9. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  11. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  12. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  13. 8
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
  14. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
  15. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
  16. 12
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java
  17. 2
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
  18. 25
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java
  19. 28
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java
  20. 16
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
  21. 24
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
  22. 10
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java
  23. 129
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
  24. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java
  25. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
  26. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java
  27. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java
  28. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  29. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
  30. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java
  31. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
  32. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java
  33. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  34. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java
  35. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
  36. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
  37. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  38. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  39. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  40. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  41. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java
  42. 20
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java
  43. 44
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
  44. 40
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java
  45. 3
      doc/databases/统计报表/车辆利润报表.sql
  46. 2
      yxt-vehfleet-ui/.env.development
  47. 48
      yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js
  48. 39
      yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js
  49. 0
      yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js
  50. 0
      yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js
  51. 0
      yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js
  52. 1
      yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue
  53. 100
      yxt-vehfleet-ui/src/router/index.js
  54. 257
      yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue
  55. 177
      yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue
  56. 339
      yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue
  57. 296
      yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue
  58. 11
      yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue
  59. 302
      yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue
  60. 11
      yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue
  61. 11
      yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue
  62. 4
      yxt-vehfleet-ui/vue.config.js
  63. 2
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/VehfleetApplication.java
  64. 62
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/api/AffiliatedCompanyRest.java
  65. 62
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/api/RegulatoryDocumentsRest.java
  66. 19
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompany.java
  67. 17
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyDto.java
  68. 20
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyMapper.java
  69. 19
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyMapper.xml
  70. 14
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyQuery.java
  71. 68
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyService.java
  72. 15
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyVo.java
  73. 53
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/Appendix.java
  74. 52
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDetailsVo.java
  75. 52
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDto.java
  76. 45
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.java
  77. 15
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.xml
  78. 107
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixService.java
  79. 24
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocuments.java
  80. 26
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsDto.java
  81. 18
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.java
  82. 19
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.xml
  83. 23
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsQuery.java
  84. 99
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsService.java
  85. 29
      yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsVo.java
  86. 318
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
  87. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java
  88. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java
  89. 59
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java

20
anrui-base/anrui-base-biz/pom.xml

@ -2,12 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<parent>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<!--<parent>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-base</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
</parent>-->
<modelVersion>4.0.0</modelVersion>
@ -16,6 +21,11 @@
<version>0.0.1</version>
<dependencies>
<dependency>
<artifactId>anrui-reportcenter-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yxt.messagecenter</groupId>
<artifactId>message-center-api</artifactId>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java

@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.common.base.config",
"com.yxt.anrui.base"
})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter","com.yxt.anrui.reportcenter"})
public class BaseApplication {
public static void main(String[] args) {

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -58,4 +59,8 @@ public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
String selectNum(String bill);
AppCompanyAdjustVo getCompanyAdjust(String sid);
ScmVehicleGression selectByLocationAndVin(@Param("locationSid") String locationSid, @Param("vinSid") String sid);
int selectCOuntByScmSid(String sid);
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@ -84,4 +84,13 @@
from base_accadj_apply
where sid = #{sid}
</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 anrui_scm.scm_vehicle_gression_veh where mainSid = #{sid}
</select>
</mapper>

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@ -149,4 +149,10 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
return baseAccadjApplyService.getCompanyAdjust(sid);
}
@PostMapping("pushReport")
@ApiOperation("测试推送车辆利润报表")
ResultBean pushReport(@RequestParam("sid")String sid){
return baseAccadjApplyService.pushReport(sid);
}
}

113
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.baseaccadjapply.*;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
@ -38,6 +39,7 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseaccadjapply.AppVehicleVersionVo;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
@ -55,6 +57,10 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
@ -81,19 +87,25 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign;
import com.yxt.anrui.riskcenter.api.loandiff.LoanDiff;
import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffInitDetails;
import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffPdfVo;
import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.base.utils.WordUtils;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -102,11 +114,15 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
import static java.util.Comparator.comparing;
@ -154,6 +170,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
private MessageFeign messageFeign;
@Autowired
private MessageListFeign messageListFeign;
@Autowired
private CarsSoldProfitFeign carsSoldProfitFeign;
public PagerVo<BaseAccadjApplyVo> listPageVo(PagerQuery<BaseAccadjApplyQuery> pq) {
BaseAccadjApplyQuery query = pq.getParams();
@ -712,6 +730,21 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
} catch (Exception e) {
e.printStackTrace();
}
baseAccadjApply = fetchBySid(bv.getBusinessSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseAccadjApply finalBaseAccadjApply = baseAccadjApply;
Future future1 = pool.submit(() -> {
pushCarSoldProfit(finalBaseAccadjApply);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -719,6 +752,79 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
}
private void pushCarSoldProfit(BaseAccadjApply baseAccadjApply) {
List<CarsSoldProfitDto> dtoList = new ArrayList<>();
if("调出".equals(baseAccadjApply.getAccadjTypeValue())){
List<BaseAccadjApplyeVeh> detailsList = baseAccadjApplyeVehService.selectByMainSid(baseAccadjApply.getSid());
detailsList.removeAll(Collections.singleton(null));
if (!detailsList.isEmpty()) {
for (int i = 0; i < detailsList.size(); i++) {
BaseAccadjApplyeVeh baseAccadjApplyeVeh = detailsList.get(i);
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseAccadjApplyeVeh.getPurchaseSid());
BaseVehicle baseVehicle= baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), baseAccadjApply.getCallOutOrgSid());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
CarsSoldProfitDto carsSoldProfitDto = new CarsSoldProfitDto();
if(sysUserVo != null){
carsSoldProfitDto.setStaffSid(sysUserVo.getStaffSid());//销售专员
carsSoldProfitDto.setStaffName(sysUserVo.getName());
carsSoldProfitDto.setCustomerSid(baseAccadjApply.getCallInOrgSid());
carsSoldProfitDto.setCustomerName(baseAccadjApply.getCallInOrgName());
}
//车辆台账中取
carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath());
//分公司
carsSoldProfitDto.setUseOrgSid(baseVehicle.getUseOrgSid());
carsSoldProfitDto.setUseOrgName(baseVehicle.getUseOrgName());
//销售日期
carsSoldProfitDto.setSaleDate(new Date());
//车架号
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(baseInternalPurchaseVehicle.getInitialWitPinMoney());
//出库价
carsSoldProfitDto.setExStockPrice(baseInternalPurchaseVehicle.getWitPinMoney());
//存放地点
carsSoldProfitDto.setLocationSid(baseVehicle.getLocation());
carsSoldProfitDto.setLocationName(baseVehicle.getLocationName());
//排产订单编号
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()) {
ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList);
}
}
}
//调车调账构造销售出库单数据
private void createSalOutStock(BaseAccadjApply baseAccadjApply) {
//获取车辆台账表中的采购部门sid
@ -1294,4 +1400,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
return "/template/" + dateStr + "/" + pdfName;
}
public ResultBean pushReport(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(sid);
pushCarSoldProfit(baseAccadjApply);
return rb.success();
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java

@ -55,4 +55,6 @@ public interface BaseAccadjApplyeVehMapper extends BaseMapper<BaseAccadjApplyeVe
List<String> fetchByAccSidAndCallOutOrgSid(@Param("sid") String sid, @Param("callOutOrgSid") String callOutOrgSid);
List<AppCompanyAdjustList> getListBySid(String sid);
List<BaseAccadjApplyeVeh> selectByMainSid(String sid);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml

@ -52,4 +52,8 @@
on av.purchaseSid = pv.sid
where av.accadjSid = #{sid}
</select>
<select id="selectByMainSid" resultType="com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh">
select * from base_accadj_applye_veh where accadjSid = #{sid}
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java

@ -111,4 +111,8 @@ public class BaseAccadjApplyeVehService extends MybatisBaseService<BaseAccadjApp
public List<AppCompanyAdjustList> getListBySid(String sid) {
return baseMapper.getListBySid(sid);
}
public List<BaseAccadjApplyeVeh> selectByMainSid(String sid) {
return baseMapper.selectByMainSid(sid);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@ -249,6 +249,6 @@
</select>
<select id="selectCOuntByScmSid" resultType="int">
select count(*) from scm_vehicle_gression_veh where mainSid = #{sid}
select count(*) from anrui_scm.scm_vehicle_gression_veh where mainSid = #{sid}
</select>
</mapper>

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

@ -1432,21 +1432,25 @@ 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());
if(baseVehicle.getCostPrice() != null){
carsSoldProfitDto.setCostPrice(baseVehicle.getCostPrice().toString());
}
//出库价
carsSoldProfitDto.setExStockPrice(baseVehicle.getContractPrice().toString());
if(baseVehicle.getContractPrice() != null){
carsSoldProfitDto.setExStockPrice(baseVehicle.getContractPrice().toString());
}
//存放地点
carsSoldProfitDto.setLocationSid(baseVehicle.getLocation());
carsSoldProfitDto.setLocationName(baseVehicle.getLocationName());
//厂家结算价
carsSoldProfitDto.setMakersSettlementPrice(baseVehicle.getSettlePrice().toString());
//排产订单编号
carsSoldProfitDto.setSchedulingId(baseVehicle.getOrderingNo());
//数据日期

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -2165,8 +2165,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
@ -2341,8 +2341,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);

8
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@ -463,7 +463,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
nextUserSid = stringResultBean.getData();
}
}
} else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){
} else if ("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))) {
if (StringUtils.isBlank(nextUserSid)) {
bv.setOrgSidPath(ydfOrgPath);
ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
@ -475,7 +475,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
nextUserSid = stringResultBean.getData();
}
}
}else if (StringUtils.isBlank(nextUserSid)) {
} else if (StringUtils.isBlank(nextUserSid)) {
ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
if (!stringResultBean.getSuccess()) {
//下一环节用户为空的情况
@ -599,7 +599,9 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
}
}
}
if ("Activity_0y8ofyd".equals(bv.getTaskDefKey()) || "Activity_09chr0i".equals(bv.getTaskDefKey())) {
contains = false;
}
if (contains) {
bv.setUserSid(nextUserSid);
bv.setTaskId(vo.getTaskId());

4
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java

@ -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,8 +69,6 @@ public class CarsSoldProfit extends BaseEntity {
private BigDecimal moveCarPrice;
@ApiModelProperty("排产订单编号")
private String schedulingId;
@ApiModelProperty("变速箱")
private String gearbox;
@ApiModelProperty("数据日期")
private Date createDate;
@ApiModelProperty("更新日期")

4
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java

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

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

@ -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

@ -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;

25
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java

@ -0,0 +1,25 @@
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;
@ApiModelProperty("厂家结算价")
private String makersSettlementPrice;
}

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

@ -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;
}

16
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java

@ -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,19 @@ 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;
@ApiModelProperty("跳转返利明细使用")
@JsonProperty("sid")
private String vinSid;
}

24
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml

@ -8,7 +8,29 @@
</select>
<select id="listPage" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo">
select * from cars_sold_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.rebatesTotal,
cp.carCost,
cp.financeServiceCharge,
cp.mediatorRebatePrice,
cp.schedulingId,
cp.createDate,
cp.updateDate,
bm.gearboxTypeValue,
bm.vehicleAlias,
cp.vinSid
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

@ -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);
}
}

129
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java

@ -5,10 +5,9 @@ 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.anrui.scm.api.scmvehrebate.ScmVehRebateCarsSoldProfitVo;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -19,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -33,6 +33,8 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private ScmVehRebateFeign scmVehRebateFeign;
public ResultBean saveProfit(List<CarsSoldProfitDto> dtoList) {
ResultBean rb = ResultBean.fireFail();
@ -74,13 +76,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 +91,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 +115,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));
}
@ -136,7 +138,100 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
IPage<CarsSoldProfitVo> pagging = baseMapper.listPage(page, qw);
List<CarsSoldProfitVo> recordList = pagging.getRecords();
recordList.removeAll(Collections.singleton(null));
if(!recordList.isEmpty()){
for (int i = 0; i < recordList.size(); i++) {
CarsSoldProfitVo carsSoldProfitVo = recordList.get(i);
//预计毛利=出库价-成本+服务费+返利-中介费-调车费
BigDecimal expectedMaoriBig = BigDecimal.ZERO;
//车辆成本 = 厂家结算价-返利
BigDecimal carCostBig = BigDecimal.ZERO;
BigDecimal adjustedMaoriBig = BigDecimal.ZERO;
String vinSid = carsSoldProfitVo.getVinSid();
CarsSoldProfitRebateAllVo carsSoldProfitRebateAllVo = rebates(vinSid).getData();
if(carsSoldProfitRebateAllVo != null){
String expectedRebateTotal = carsSoldProfitRebateAllVo.getExpectedRebateTotal();
carsSoldProfitVo.setRebatesTotal(expectedRebateTotal);
carsSoldProfitVo.setMakersSettlementPrice(carsSoldProfitRebateAllVo.getMakersSettlementPrice());
carsSoldProfitVo.setRebatesAdjust(carsSoldProfitRebateAllVo.getAdjustedRebateTotal());
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getExStockPrice())){
expectedMaoriBig = expectedMaoriBig.add(new BigDecimal(carsSoldProfitVo.getExStockPrice()));
}
//厂家结算价
if(StringUtils.isNotBlank(carsSoldProfitVo.getMakersSettlementPrice())){
carCostBig = carCostBig.add(new BigDecimal(carsSoldProfitVo.getMakersSettlementPrice()));
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getRebatesTotal())){
carCostBig = carCostBig.subtract(new BigDecimal(carsSoldProfitVo.getRebatesTotal()));
carsSoldProfitVo.setCarCost(carCostBig.toString());
expectedMaoriBig = expectedMaoriBig.add(new BigDecimal(carsSoldProfitVo.getRebatesTotal()));
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getCarCost())){
expectedMaoriBig = expectedMaoriBig.subtract(carCostBig);
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getFinanceServiceCharge())){
expectedMaoriBig = expectedMaoriBig.add(new BigDecimal(carsSoldProfitVo.getFinanceServiceCharge()));
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getMediatorRebatePrice())){
expectedMaoriBig = expectedMaoriBig.subtract(new BigDecimal(carsSoldProfitVo.getMediatorRebatePrice()));
}
if(StringUtils.isNotBlank(carsSoldProfitVo.getMoveCarPrice())){
expectedMaoriBig = expectedMaoriBig.subtract(new BigDecimal(carsSoldProfitVo.getMoveCarPrice()));
}
carsSoldProfitVo.setExpectedMaori(expectedMaoriBig.toString());
carsSoldProfitVo.setAdjustedMaori(expectedMaoriBig.subtract(new BigDecimal(carsSoldProfitVo.getRebatesAdjust())).toString());
if(StringUtils.isBlank(carsSoldProfitVo.getMakersSettlementPrice())){
carsSoldProfitVo.setMakersSettlementPrice("-");
}
if(StringUtils.isBlank(carsSoldProfitVo.getFinanceServiceCharge())){
carsSoldProfitVo.setFinanceServiceCharge("-");
}
if(StringUtils.isBlank(carsSoldProfitVo.getMediatorRebatePrice())){
carsSoldProfitVo.setMediatorRebatePrice("-");
}
}
}
PagerVo<CarsSoldProfitVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<CarsSoldProfitRebateAllVo> rebates(String sid) {
ResultBean<CarsSoldProfitRebateAllVo> rb = ResultBean.fireFail();
CarsSoldProfitRebateAllVo carsSoldProfitRebateAllVo = new CarsSoldProfitRebateAllVo();
List<CarsSoldProfitRebateDetailsVo> list = new ArrayList<>();
String vinSid = sid;
BigDecimal expectedRebateTotalAll = BigDecimal.ZERO;
BigDecimal adjustedRebateTotalAll = BigDecimal.ZERO;
String makersSettlementPrice = "";
List<ScmVehRebateCarsSoldProfitVo> scmList = scmVehRebateFeign.getDetailByVinSid(vinSid).getData();
if (!scmList.isEmpty()) {
for (int i = 0; i < scmList.size(); i++) {
ScmVehRebateCarsSoldProfitVo scmVehRebateCarsSoldProfitVo = scmList.get(i);
CarsSoldProfitRebateDetailsVo carsSoldProfitRebateDetailsVo = new CarsSoldProfitRebateDetailsVo();
carsSoldProfitRebateDetailsVo.setPolicy(scmVehRebateCarsSoldProfitVo.getPolicy());
carsSoldProfitRebateDetailsVo.setRebateType(scmVehRebateCarsSoldProfitVo.getRebateTypeValue());
carsSoldProfitRebateDetailsVo.setYearAndMonth(scmVehRebateCarsSoldProfitVo.getPalceGenDate());
carsSoldProfitRebateDetailsVo.setRebateName(scmVehRebateCarsSoldProfitVo.getRebateName());
carsSoldProfitRebateDetailsVo.setExpectedRebate(scmVehRebateCarsSoldProfitVo.getEstimateRebate());
carsSoldProfitRebateDetailsVo.setRebatesAdjust(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney());
list.add(carsSoldProfitRebateDetailsVo);
if (StringUtils.isNotBlank(scmVehRebateCarsSoldProfitVo.getEstimateRebate())) {
expectedRebateTotalAll = expectedRebateTotalAll.add(new BigDecimal(scmVehRebateCarsSoldProfitVo.getEstimateRebate()));
}
if (StringUtils.isNotBlank(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney())) {
adjustedRebateTotalAll = adjustedRebateTotalAll.add(new BigDecimal(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney()));
}
makersSettlementPrice = scmVehRebateCarsSoldProfitVo.getManufactorSettlementPrice();
}
}
carsSoldProfitRebateAllVo.setList(list);
carsSoldProfitRebateAllVo.setMakersSettlementPrice(makersSettlementPrice);
carsSoldProfitRebateAllVo.setAdjustedRebateTotal(adjustedRebateTotalAll.toString());
carsSoldProfitRebateAllVo.setExpectedRebateTotal(expectedRebateTotalAll.toString());
return rb.success().setData(carsSoldProfitRebateAllVo);
}
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java

@ -115,4 +115,7 @@ public class ScmCollectionRebate extends BaseEntity {
private String isReduceTop;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java

@ -139,4 +139,7 @@ public class ScmSpecialRebate extends BaseEntity {
private String createOrgName; // 创建组织名称
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@ -150,6 +150,9 @@ public class ScmSpecialRebateDetailsVo implements Vo {
private String createOrgName; // 创建组织名称
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
private String specialRebateSid;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@ -136,4 +136,7 @@ public class ScmSpecialRebateDto implements Dto {
private String createOrgName; // 创建组织名称
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@ -144,4 +144,7 @@ public class ScmSpecialRebateVo implements Vo {
private String secondCheckState;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@ -153,6 +153,7 @@ public class ScmVehRebate extends BaseEntity {
private String purchaseSystemSid;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

36
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java

@ -0,0 +1,36 @@
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/16
**/
@Data
public class ScmVehRebateCarsSoldProfitVo implements Vo {
private static final long serialVersionUID = -5925794987523752087L;
@ApiModelProperty("政策方")
private String policy;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("返利类型")
private String rebateTypeValue;
@ApiModelProperty("返利名称")
private String rebateName;
@ApiModelProperty("预提返利:预提返利-预提费用的结果(待支付+抵顶)")
private String estimateRebate;
@ApiModelProperty("预计待支付费用")
private String expectTreatCost;
@ApiModelProperty("预计抵顶费用")
private String expectSuppCost;
@ApiModelProperty("返利调整")
private String adjustmentMoney;
@ApiModelProperty("厂家结算价")
private String manufactorSettlementPrice;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java

@ -174,6 +174,9 @@ public class ScmVehRebateDetailsVo implements Vo {
private String purchaseSystemSid;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
private String vehRebateSid;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java

@ -67,6 +67,9 @@ public class ScmVehRebateDto implements Dto {
private String calculationModeKey;
@ApiModelProperty("计算方式Value")
private String calculationModeValue;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("组织全路径")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@ -66,6 +66,11 @@ public interface ScmVehRebateFeign {
@ResponseBody
public ResultBean<List<ScmVehRebateStatMxVo>> getDetail(@PathVariable("sid") String sid);
@ApiOperation("车辆利润报表查询返利明细")
@GetMapping("/getDetailByVinSid")
@ResponseBody
ResultBean<List<ScmVehRebateCarsSoldProfitVo>> getDetailByVinSid(@RequestParam("vinSid")String vinSid);
@ApiOperation("返利类型统计")
@PostMapping("/typeStatistics")
@ResponseBody

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

@ -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("预计待支付费用")

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java

@ -154,4 +154,7 @@ public class ScmVehRebateVehDto implements Dto {
private String purchaseSystemSid;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("返利政策方")
private String policySideKey;
private String policySideValue;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@ -158,4 +158,6 @@ public class ScmVehRebateVo implements Vo {
private BigDecimal notUploadMoney;
@ApiModelProperty("二次核对状态")
private String secondCheckState;
@ApiModelProperty("返利政策方")
private String policySideValue;
}

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

@ -84,4 +84,6 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
List<ScmVehRebateStatMxVo> getDetail(String vehSid);
List<ScmVehRebateTypeStatMxVo> getTypeDetail(@Param("sids") List<String> sids);
List<ScmVehRebateCarsSoldProfitVo> getDetailByVinSid(String vinSid);
}

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@ -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,
@ -413,4 +415,19 @@
</foreach>
</if>
</select>
<select id="getDetailByVinSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateCarsSoldProfitVo">
SELECT
r.palceGenDate,
r.rebateTypeValue,
r.rebateName,
r.estimateRebate,
r.expectTreatCost,
r.expectSuppCost,
r.adjustmentMoney,
r.manufactorSettlementPrice
FROM
scm_veh_rebate r
WHERE r.vehSid = #{vinSid}
</select>
</mapper>

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@ -89,6 +89,11 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
return rb.success().setData(scmVehRebateStatMxVos);
}
@Override
public ResultBean<List<ScmVehRebateCarsSoldProfitVo>> getDetailByVinSid(String vinSid) {
return scmVehRebateService.getDetailByVinSid(vinSid);
}
@Override
public ResultBean<PagerVo<ScmVehRebateTypeStatVo>> typeStatistics(PagerQuery<ScmVehRebateTypeStatQuery> pq) {
ResultBean rb = ResultBean.fireFail();

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@ -2718,4 +2718,31 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
return scmVehRebateTypeStatMxVos;
}
public ResultBean<List<ScmVehRebateCarsSoldProfitVo>> getDetailByVinSid(String vinSid) {
ResultBean<List<ScmVehRebateCarsSoldProfitVo>> rb = ResultBean.fireFail();
List<ScmVehRebateCarsSoldProfitVo> list = baseMapper.getDetailByVinSid(vinSid);
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
ScmVehRebateCarsSoldProfitVo scmVehRebateCarsSoldProfitVo = list.get(i);
String expectedRebate = scmVehRebateCarsSoldProfitVo.getEstimateRebate();
BigDecimal expectAll = BigDecimal.ZERO;
String expectTreatCost = scmVehRebateCarsSoldProfitVo.getExpectTreatCost();
String expectSuppCost = scmVehRebateCarsSoldProfitVo.getExpectSuppCost();
if(StringUtils.isNotBlank(expectedRebate)){
expectAll = expectAll.add(new BigDecimal(expectedRebate));
}
if(StringUtils.isNotBlank(expectTreatCost)){
expectAll = expectAll.subtract(new BigDecimal(expectTreatCost));
}
if(StringUtils.isNotBlank(expectSuppCost)){
expectAll = expectAll.subtract(new BigDecimal(expectSuppCost));
}
scmVehRebateCarsSoldProfitVo.setEstimateRebate(expectAll.toString());
}
}
return rb.success().setData(list);
}
}

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java

@ -22,37 +22,37 @@ public interface AppInventoryAllocatebillFeign {
/**********************************************流程********************************************/
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@PutMapping("/agreeCreditInfo/{type}")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto, @PathVariable("type") String type);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@PutMapping("/rejectCreditInfo/{type}")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@PutMapping("/recallCreditInfo/{type}")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@PutMapping("/stopCreditInfo/{type}")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@GetMapping("/getFlowOperateTitle/{type}")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query, @PathVariable("type") String type);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@PutMapping(value = "/delegate/{type}")
@ResponseBody
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@PutMapping(value = "/assignTask/{type}")
@ResponseBody
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type);
}

20
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java

@ -49,37 +49,37 @@ public class AppInventoryAllocatebillRest implements AppInventoryAllocatebillFei
}
@Override
public ResultBean agreeCreditInfo(AppFlowDto dto) {
return appInventoryAllocatebillService.agreeCreditInfo(dto);
public ResultBean agreeCreditInfo(AppFlowDto dto, String type) {
return appInventoryAllocatebillService.agreeCreditInfo(dto, type);
}
@Override
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
return appInventoryAllocatebillService.rejectCreditInfo(query);
public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.rejectCreditInfo(query, type);
}
@Override
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
public ResultBean recallCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
public ResultBean stopCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
return appInventoryAllocatebillService.getFlowOperateTitle(query);
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query, String type) {
return appInventoryAllocatebillService.getFlowOperateTitle(query, type);
}
@Override
public ResultBean delegate(AppDelegateQuery delegateQuery) {
public ResultBean delegate(AppDelegateQuery delegateQuery, String type) {
return appInventoryAllocatebillService.delegate(delegateQuery);
}
@Override
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
public ResultBean assignTask(AppDelegateQuery delegateQuery, String type) {
return appInventoryAllocatebillService.assignTask(delegateQuery);
}
}

44
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java

@ -63,7 +63,7 @@ public class AppInventoryAllocatebillService {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetailsVoNew data = wmsInventoryAllocatebillFeign.fetchDetailsBySid(sid).getData();
AppInventoryAllocateBillDetailsVoNew appInventoryAllocateBillDetailsVoNew = new AppInventoryAllocateBillDetailsVoNew();
BeanUtil.copyProperties(data,appInventoryAllocateBillDetailsVoNew);
BeanUtil.copyProperties(data, appInventoryAllocateBillDetailsVoNew);
appInventoryAllocateBillDetailsVoNew.setProcInsId(data.getProcInstId());
List<AppInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList = appInventoryAllocateBillDetailsVoNew.getWmsInventoryAllocateBillDetailNewList();
BigDecimal total = new BigDecimal("0");
@ -75,7 +75,7 @@ public class AppInventoryAllocatebillService {
return rb.success().setData(appInventoryAllocateBillDetailsVoNew);
}
public ResultBean agreeCreditInfo(AppFlowDto dto) {
public ResultBean agreeCreditInfo(AppFlowDto dto, String type) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
@ -92,18 +92,32 @@ public class AppInventoryAllocatebillService {
CompleteFlowDto completeFlowDto = new CompleteFlowDto();
BeanUtil.copyProperties(dto, completeFlowDto);
completeFlowDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto);
ResultBean resultBean = new ResultBean();
if ("1".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto);
} else if ("2".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete2(completeFlowDto);
} else if ("3".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete3(completeFlowDto);
}
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) {
ResultBean rb = ResultBean.fireFail();
FlowTaskQuery flowTaskQuery = new FlowTaskQuery();
BeanUtil.copyProperties(query, flowTaskQuery);
ResultBean resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery);
ResultBean resultBean = new ResultBean();
if ("1".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery);
} else if ("2".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject2(flowTaskQuery);
} else if ("3".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject3(flowTaskQuery);
}
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -132,7 +146,7 @@ public class AppInventoryAllocatebillService {
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query, String type) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
@ -140,7 +154,14 @@ public class AppInventoryAllocatebillService {
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery);
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject = new ResultBean<>();
if ("1".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery);
} else if ("2".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject2(getNodeQuery);
} else if ("3".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject3(getNodeQuery);
}
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
@ -148,7 +169,14 @@ public class AppInventoryAllocatebillService {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit = new ResultBean<>();
if ("1".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("2".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("3".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
}
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();

40
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java

@ -22,6 +22,8 @@ public interface WmsInventoryAllocatebillFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryAllocateBillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid);
/*********************************************************调拨申请(分公司内)流程************************************************************/
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteFlowDto query);
@ -38,6 +40,44 @@ public interface WmsInventoryAllocatebillFeign {
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************调拨申请(集团内)流程************************************************************/
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete2")
public ResultBean complete2(@Valid @RequestBody CompleteFlowDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject2")
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject2(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit2")
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit2(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject2")
public ResultBean taskReject2(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************调拨申请(一级站内)流程************************************************************/
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete3")
public ResultBean complete3(@Valid @RequestBody CompleteFlowDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject3")
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject3(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit3")
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit3(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject3")
public ResultBean taskReject3(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************共用************************************************************/
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody FlowTaskQuery query);

3
doc/databases/统计报表/车辆利润报表.sql

@ -23,7 +23,6 @@ CREATE TABLE `cars_sold_profit`
`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 '采购系统名称',
@ -31,7 +30,6 @@ CREATE TABLE `cars_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 '返利调整',
@ -44,7 +42,6 @@ CREATE TABLE `cars_sold_profit`
`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`),

2
yxt-vehfleet-ui/.env.development

@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://26077a35f5.wicp.vip"
VUE_APP_URL = "http://192.168.0.106:8111"
VUE_APP_URL = "http://192.168.0.105:8111"

48
yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js

@ -0,0 +1,48 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/vehfleet/v1/affiliatedcompany/listPage', method: 'post', data: params, headers: {
'Content-Type': 'application/json'
}
})
},
// 查询全部列表
listAll: function() {
return request({
url: '/vehfleet/v1/affiliatedcompany/list', method: 'post', headers: {
'Content-Type': 'application/json'
}
})
},
// 新增、保存
saveAffiliatedcompany: function(data) {
return request({
url: '/vehfleet/v1/affiliatedcompany/saveOrUpdate', method: 'post', data: data, headers: {
'Content-Type': 'application/json'
}
})
},
// 初始化
initAffiliatedcompany: function(data) {
return request({
url: '/vehfleet/v1/affiliatedcompany/fetchSid/' + data, method: 'get'
})
},
// 删除
deleteBySids: function(data) {
return request({
url: '/vehfleet/v1/affiliatedcompany/delBySids', method: 'DELETE', data: data, headers: {
'Content-Type': 'application/json'
}
})
}
}

39
yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js

@ -0,0 +1,39 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/vehfleet/v1/regulatorydocuments/listPage', method: 'post', data: params, headers: {
'Content-Type': 'application/json'
}
})
},
// 新增、保存
saveRegulatorydocuments: function(data) {
return request({
url: '/vehfleet/v1/regulatorydocuments/saveOrUpdate', method: 'post', data: data, headers: {
'Content-Type': 'application/json'
}
})
},
// 初始化
initRegulatorydocuments: function(data) {
return request({
url: '/vehfleet/v1/regulatorydocuments/fetchSid/' + data, method: 'get'
})
},
// 删除
deleteBySids: function(data) {
return request({
url: '/vehfleet/v1/regulatorydocuments/delBySids', method: 'DELETE', data: data, headers: {
'Content-Type': 'application/json'
}
})
}
}

0
yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js

0
yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js

0
yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js

1
yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue

@ -148,6 +148,7 @@ export default {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
this.$emit('change', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))

100
yxt-vehfleet-ui/src/router/index.js

@ -1,47 +1,72 @@
import Vue from 'vue'
import Router from 'vue-router'
/* Layout */
import Layout from '@/layout'
Vue.use(Router)
/* Layout */
import Layout from '@/layout'
/* 所有角色可以访问/没有权限要求的基页 */
export const constantRoutes = [{
path: '/redirect',
component: Layout,
hidden: true,
children: [{
path: '/redirect/:path(.*)',
component: () => import('@/views/redirect/index.vue')
}]
},
{
path: '/',
redirect: 'index'
},
{
path: '/index',
component: Layout,
redirect: '/index',
children: [{
path: '/index',
component: () =>
import('@/views/index.vue'),
name: 'index',
meta: {
title: '主页',
noCache: true,
affix: true
}
}]
},
{
path: '/404',
component: () =>
import('@/views/404'),
hidden: true
}
path: '/redirect', component: Layout, hidden: true, children: [{
path: '/redirect/:path(.*)', component: () => import('@/views/redirect/index.vue')
}]
}, {
path: '/', redirect: 'index'
}, {
path: '/index', component: Layout, redirect: '/index', children: [{
path: '/index', component: () => import('@/views/index.vue'), name: 'index', meta: {
title: '主页', noCache: true, affix: true
}
}]
}, {
path: '/vehicleAdmissionApply', component: Layout, redirect: '/vehicleAdmissionApply', children: [{
path: '/vehicleAdmissionApply',
component: () => import('@/views/vehicleAdmissionApply/vehicleAdmissionApply.vue'),
name: 'VehicleAdmissionApply',
meta: {
title: '车辆准入申请管理'
}
}]
}, {
path: '/vehicleLedger', component: Layout, redirect: '/vehicleLedger', children: [{
path: '/vehicleLedger',
component: () => import('@/views/vehicleLedger/vehicleLedger.vue'),
name: 'VehicleLedger',
meta: {
title: '挂靠车辆台账管理'
}
}]
}, {
path: '/affiliatedCompany', component: Layout, redirect: '/affiliatedCompany', children: [{
path: '/affiliatedCompany',
component: () => import('@/views/affiliatedCompany/affiliatedCompany.vue'),
name: 'AffiliatedCompany',
meta: {
title: '挂靠公司管理'
}
}]
}, {
path: '/vehicleInsuranceLedger', component: Layout, redirect: '/vehicleInsuranceLedger', children: [{
path: '/vehicleInsuranceLedger',
component: () => import('@/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue'),
name: 'VehicleInsuranceLedger',
meta: {
title: '车辆保险台账管理'
}
}]
}, {
path: '/superviseFile', component: Layout, redirect: '/superviseFile', children: [{
path: '/superviseFile',
component: () => import('@/views/superviseFile/superviseFile.vue'),
name: 'SuperviseFile',
meta: {
title: '监管部门文件管理'
}
}]
}, {
path: '/404', component: () => import('@/views/404'), hidden: true
}
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]
@ -50,8 +75,7 @@ const createRouter = () => new Router({
// mode: 'history', // require service support
scrollBehavior: () => ({
y: 0
}),
routes: constantRoutes
}), routes: constantRoutes
})
const router = createRouter()

257
yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue

@ -0,0 +1,257 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar ref="btnbar" view-title="挂靠公司管理" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button class="searchbtn" size="small" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="120px">
<el-form-item label="挂靠公司名称:">
<el-input v-model="queryParams.params.corporateName" clearable placeholder=""/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button icon="el-icon-search" size="small" type="primary" @click="dosearch">查询</el-button>
<el-button icon="el-icon-refresh" size="small" type="primary" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">挂靠公司列表</div>
</div>
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="handleSelectionChange"
>
<el-table-column align="center" fixed type="selection" width="50"/>
<el-table-column :index="indexMethod" align="center" fixed label="序号" type="index" width="60"/>
<el-table-column align="center" label="公司名称" prop="corporateName"/>
<el-table-column align="center" label="联系人" prop="contacts"/>
<el-table-column align="center" fit label="联系电话" prop="contactNumber"/>
</el-table>
</div>
<div class="pages">
<pagination v-show="dataList.length > 0" :limit.sync="queryParams.size" :page.sync="queryParams.current"
:total="queryParams.total" class="pagination" @pagination="loadList"
/>
</div>
</div>
</div>
<!--新增修改部分组件-->
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
<script>
import req from '@/api/affiliatedCompany/affiliatedCompany'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './affiliatedCompanyAdd'
export default {
name: 'AffiliatedCompany',
components: {
ButtonBar,
Pagination,
pageye,
divAdd
},
data() {
return {
viewState: 1, // 1 2 3 4
isSearchShow: false, //
tableLoading: false,
//
dataList: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: 'el-icon-plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'el-icon-edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'el-icon-delete',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
selectionList: [],
// sid
sids: [], // SID
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
corporateName: ''
}
}
}
},
created() {
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
this.loadList()
},
methods: {
handleSelectionChange(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
//
dosearch() {
this.queryParams.current = 1
this.loadList()
},
//
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
corporateName: ''
}
}
this.init()
},
//
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then(resp => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

177
yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue

@ -0,0 +1,177 @@
<template>
<div>
<div class="tab-header webtop">
<div>挂靠公司信息</div>
<div>
<el-button :disabled="submitdisabled" size="small" type="primary" @click="saveOrUpdate">保存</el-button>
<el-button size="small" type="info" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="24">
<div class="span-sty"><span class="must">*</span> 公司名称</div>
<el-form-item prop="corporateName">
<el-input v-model="formobj.corporateName" class="addinputw addinputInfo" clearable placeholder="挂靠公司名称"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">联系人</div>
<el-form-item>
<el-input v-model="formobj.contacts" class="addinputw addinputInfo" clearable placeholder="联系人"/>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">联系电话</div>
<el-form-item>
<el-input v-model="formobj.contactNumber" class="addinputw addinputInfo" clearable placeholder="联系电话"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/affiliatedCompany/affiliatedCompany.js'
import { getOrgSidByPath } from '@/api/Common/dictcommons.js'
export default {
components: {},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
corporateName: '',
contacts: '',
contactNumber: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
createBySid: window.sessionStorage.getItem('userSid'),
createByName: window.sessionStorage.getItem('name'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
},
rules: {
corporateName: [{ required: true, message: '挂靠公司名称不能为空', trigger: 'blur' }]
}
}
},
methods: {
getDictValue() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
}
})
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveAffiliatedcompany(this.formobj).then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
corporateName: '',
contacts: '',
contactNumber: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
createBySid: window.sessionStorage.getItem('userSid'),
createByName: window.sessionStorage.getItem('name'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
}
this.$emit('doback')
},
showAdd() {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.initAffiliatedcompany(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
}).catch(e => {
this.formobj = row
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
align-items: center;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

339
yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue

@ -0,0 +1,339 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar ref="btnbar" view-title="监管部门文件管理" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button class="searchbtn" size="small" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="120px">
<el-form-item label="文件名称:">
<el-select v-model="queryParams.params.fileNameValue" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in fileList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="监管部门:">
<el-select v-model="queryParams.params.departmentValue" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in orgList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="queryParams.params.startTime" format="yyyy-MM-dd" placeholder="选择日期"
style="width: 200px;" type="date" value-format="yyyy-MM-dd"
>
</el-date-picker>
<el-date-picker v-model="queryParams.params.endTime" format="yyyy-MM-dd" placeholder="选择日期"
style="width: 200px;" type="date" value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="上传人">
<el-input v-model="queryParams.params.uploaderName" clearable placeholder="上传人"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="车队">
<el-select v-model="queryParams.params.fleetName" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in fleetList" :key="item.sid" :label="item.corporateName" :value="item.corporateName">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="queryParams.params.remarks" clearable placeholder="备注" style="width: 200px;"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button icon="el-icon-search" size="small" type="primary" @click="dosearch">查询</el-button>
<el-button icon="el-icon-refresh" size="small" type="primary" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">文件列表</div>
</div>
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="handleSelectionChange"
>
<el-table-column align="center" fixed type="selection" width="50"/>
<el-table-column :index="indexMethod" align="center" fixed label="序号" type="index" width="60"/>
<el-table-column align="center" label="文件名称" prop="fileNameValue"/>
<el-table-column align="center" label="监管部门" prop="departmentValue"/>
<el-table-column align="center" fit label="上传时间" prop="createTime"/>
<el-table-column align="center" fit label="上传人" prop="uploaderName"/>
<el-table-column align="center" fit label="车队" prop="fleetName"/>
<el-table-column align="center" fit label="备注" prop="remarks"/>
</el-table>
</div>
<div class="pages">
<pagination v-show="dataList.length > 0" :limit.sync="queryParams.size" :page.sync="queryParams.current"
:total="queryParams.total" class="pagination" @pagination="loadList"
/>
</div>
</div>
</div>
<!--新增修改部分组件-->
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
<script>
import req from '@/api/superviseFile/superviseFile'
import req2 from '@/api/affiliatedCompany/affiliatedCompany'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './superviseFileAdd'
import { typeValues } from '@/api/Common/dictcommons'
export default {
name: 'SuperviseFile',
components: {
ButtonBar,
Pagination,
pageye,
divAdd
},
data() {
return {
viewState: 1, // 1 2 3 4
isSearchShow: false, //
tableLoading: false,
//
dataList: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: 'el-icon-plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'el-icon-edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'el-icon-delete',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
selectionList: [],
// sid
sids: [], // SID
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
fileNameKey: '',
fileNameValue: '',
departmentKey: '',
departmentValue: '',
startTime: '',
endTime: '',
uploaderName: '',
fleetSid: '',
fleetName: '',
remarks: ''
}
},
fileList: [],
orgList: [],
fleetList: []
}
},
created() {
//
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
this.loadList()
},
methods: {
init() {
typeValues({ type: 'fileName' }).then((res) => {
if (res.success) {
this.fileList = res.data
}
})
typeValues({ type: 'superviseOrg' }).then((res) => {
if (res.success) {
this.orgList = res.data
}
})
req2.listAll().then((res) => {
if (res.success) {
this.fleetList = res.data
}
})
},
handleSelectionChange(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
//
dosearch() {
this.queryParams.current = 1
this.loadList()
},
//
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
fileNameKey: '',
fileNameValue: '',
departmentKey: '',
departmentValue: '',
startTime: '',
endTime: '',
uploaderName: '',
fleetSid: '',
fleetName: '',
remarks: ''
}
}
this.init()
},
//
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then(resp => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

296
yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue

@ -0,0 +1,296 @@
<template>
<div>
<div class="tab-header webtop">
<div>监管部门文件</div>
<div>
<el-button :disabled="submitdisabled" size="small" type="primary" @click="saveOrUpdate">保存</el-button>
<el-button size="small" type="info" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty"><span class="must">*</span> 车队名称</div>
<el-form-item prop="fleetName">
<el-select v-model="formobj.fleetName" clearable placeholder="请选择" class="addinputw addinputInfo" @change="selectFleetName">
<el-option v-for="(item,i) in fleetList" :key="item.sid" :label="item.corporateName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">上传人</div>
<el-form-item>
<span class="addinputw addinputInfo">{{ formobj.uploaderName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty"><span class="must">*</span> 文件名称</div>
<el-form-item prop="fileNameValue">
<el-select v-model="formobj.fileNameValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectFileName">
<el-option v-for="item in fileList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="must">*</span> 监管部门</div>
<el-form-item prop="departmentValue">
<el-select v-model="formobj.departmentValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectDepartment">
<el-option v-for="item in orgList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item >
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/superviseFile/superviseFile'
import req2 from '@/api/affiliatedCompany/affiliatedCompany'
import uploadImg from '@/components/uploadFile/uploadImg'
import { getOrgSidByPath,
typeValues } from '@/api/Common/dictcommons.js'
export default {
components: {
uploadImg
},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
fleetSid: '',
fleetName: '',
uploaderName: window.sessionStorage.getItem('name'),
uploaderSid: window.sessionStorage.getItem('userSid'),
fileNameKey: '',
fileNameValue: '',
departmentKey: '',
departmentValue: '',
filePaths: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
createBySid: window.sessionStorage.getItem('userSid'),
createByName: window.sessionStorage.getItem('name'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
},
rules: {
fleetName: [{ required: true, message: '请选择车队', trigger: 'change' }],
fileNameValue: [{ required: true, message: '请选择文件名称', trigger: 'change' }],
departmentValue: [{ required: true, message: '请选择监管部门', trigger: 'change' }]
},
imgList: [],
fileList: [],
orgList: [],
fleetList: []
}
},
methods: {
getDictValue() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
}
})
typeValues({ type: 'fileName' }).then((res) => {
if (res.success) {
this.fileList = res.data
}
})
typeValues({ type: 'superviseOrg' }).then((res) => {
if (res.success) {
this.orgList = res.data
}
})
req2.listAll().then((res) => {
if (res.success) {
this.fleetList = res.data
}
})
},
selectFleetName(val) {
const choose = this.fleetList.filter((item) => item.sid === val)
if (choose !== null && choose.length > 0) {
this.formobj.fleetName = choose[0].corporateName
this.formobj.fleetSid = choose[0].sid
} else {
this.formobj.fleetName = ''
this.formobj.fleetSid = ''
}
},
selectFileName(val) {
const choose = this.fileList.filter((item) => item.dictKey === val)
if (choose !== null && choose.length > 0) {
this.formobj.fileNameValue = choose[0].dictValue
this.formobj.fileNameKey = choose[0].dictKey
} else {
this.formobj.fileNameValue = ''
this.formobj.fileNameKey = ''
}
},
selectDepartment(val) {
const choose = this.orgList.filter((item) => item.dictKey === val)
if (choose !== null && choose.length > 0) {
this.formobj.departmentValue = choose[0].dictValue
this.formobj.departmentKey = choose[0].dictKey
} else {
this.formobj.departmentValue = ''
this.formobj.departmentKey = ''
}
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveRegulatorydocuments(this.formobj).then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.formobj = {
sid: '',
fleetSid: '',
fleetName: '',
uploaderName: window.sessionStorage.getItem('name'),
uploaderSid: window.sessionStorage.getItem('userSid'),
fileNameKey: '',
fileNameValue: '',
departmentKey: '',
departmentValue: '',
filePaths: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
createBySid: window.sessionStorage.getItem('userSid'),
createByName: window.sessionStorage.getItem('name'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
}
this.$emit('doback')
},
showAdd() {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.initRegulatorydocuments(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) {
this.imgList.push({
url: resp.data.filePaths[i]
})
}
}
}).catch(e => {
this.formobj = row
})
},
backData(value) {
console.log("backData", value)
this.formobj.filePaths = []
this.imgList =value
for (var i = 0; i < value.length; i++) {
this.formobj.filePaths.push(value[i].url)
}
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
align-items: center;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

11
yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue

@ -0,0 +1,11 @@
<script setup>
</script>
<template>
</template>
<style scoped>
</style>

302
yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue

@ -0,0 +1,302 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar ref="btnbar" view-title="车辆保险台账管理" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button class="searchbtn" size="small" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="120px">
<el-form-item label="车牌号:">
<el-select v-model="queryParams.params.fileName" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in fileList" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="监管部门:">
<el-select v-model="queryParams.params.orgName" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in orgList" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="queryParams.params.createTimeStart" format="yyyy-MM-dd" placeholder="选择日期"
style="width: 200px;" type="date" value-format="yyyy-MM-dd"
>
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" format="yyyy-MM-dd" placeholder="选择日期"
style="width: 200px;" type="date" value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="上传人">
<el-input v-model="queryParams.params.uploader" clearable placeholder="上传人" style="width: 200px;"/>
</el-form-item>
<el-form-item label="车队">
<el-select v-model="queryParams.params.fleetName" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in fleetList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="queryParams.params.remarks" clearable placeholder="备注" style="width: 200px;"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button icon="el-icon-search" size="small" type="primary" @click="dosearch">查询</el-button>
<el-button icon="el-icon-refresh" size="small" type="primary" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">文件列表</div>
</div>
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="handleSelectionChange"
>
<el-table-column :index="indexMethod" align="center" fixed label="序号" type="index" width="60"/>
<el-table-column align="center" label="文件名称" prop="purchaseOrderNo"/>
<el-table-column align="center" label="监管部门" prop="modelName"/>
<el-table-column align="center" fit label="上传时间" prop="vehicleNum"/>
<el-table-column align="center" fit label="上传人" prop="vehicleNum"/>
<el-table-column align="center" fit label="车队" prop="vehicleNum"/>
<el-table-column align="center" fit label="备注" prop="vehicleNum"/>
</el-table>
</div>
<div class="pages">
<pagination v-show="dataList.length > 0" :limit.sync="queryParams.size" :page.sync="queryParams.current"
:total="queryParams.total" class="pagination" @pagination="loadList"
/>
</div>
</div>
</div>
<!--新增修改部分组件-->
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
<script>
import req from '@/api/superviseFile/superviseFile'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './vehicleInsuranceLedgerAdd'
export default {
name: 'VehicleInsuranceLedger',
components: {
ButtonBar,
Pagination,
pageye,
divAdd
},
data() {
return {
viewState: 1, // 1 2 3 4
isSearchShow: false, //
tableLoading: false,
//
dataList: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: 'el-icon-plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'el-icon-edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'el-icon-delete',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
selectionList: [],
// sid
sids: [], // SID
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
fileName: '',
orgName: '',
createTimeStart: '',
createTimeEnd: '',
uploader: '',
fleetName: '',
remarks: ''
}
},
fileList: [],
orgList: [],
fleetList: []
}
},
created() {
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
handleSelectionChange(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit(row) {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(row.sid, row)
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
//
dosearch() {
this.queryParams.current = 1
this.loadList()
},
//
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
fileName: '',
orgName: '',
createTimeStart: '',
createTimeEnd: '',
uploader: '',
fleetName: '',
remarks: ''
}
}
this.init()
},
//
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then(resp => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

11
yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue

@ -0,0 +1,11 @@
<script setup>
</script>
<template>
</template>
<style scoped>
</style>

11
yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue

@ -0,0 +1,11 @@
<script setup>
</script>
<template>
</template>
<style scoped>
</style>

4
yxt-vehfleet-ui/vue.config.js

@ -24,7 +24,7 @@ module.exports = {
*在大多数情况下请使用/
*详细信息https://cli.vuejs.org/config/#publicpath
*/
publicPath: process.env.NODE_ENV === 'production' ? '/riskcenter/' : '/',
publicPath: process.env.NODE_ENV === 'production' ? '/vehfleet/' : '/',
outputDir: 'System',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
@ -41,6 +41,7 @@ module.exports = {
proxy: {
'/api': { // 匹配所有以 '/api'开头的请求路径
// target: 'http://127.0.0.1:8111/',
// target: 'http://192.168.0.105:8111/vehfleet',
target: process.env.VUE_APP_URL, // 代理目标的基础路径
changeOrigin: true, // 支持跨域
pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
@ -49,6 +50,7 @@ module.exports = {
},
'/upload': { // 匹配所有以 '/api'开头的请求路径
// target: 'http://4424790b0u.qicp.vip/',
// target: 'http://192.168.0.105:8111/vehfleet',
target: process.env.VUE_APP_URL, // 代理目标的基础路径
changeOrigin: true, // 支持跨域
pathRewrite: { // 重写路径: 去掉路径中开头的'/api'

2
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/VehfleetApplication.java

@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableDiscoveryClient
@SpringBootApplication(scanBasePackages = {
"com.yxt.common.base.config",
"com.yxt.anrui.oa"
"com.yxt.anrui.vehfleet"
})
@EnableFeignClients(basePackages = {"com.yxt.*.*"})
public class VehfleetApplication {

62
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/api/AffiliatedCompanyRest.java

@ -0,0 +1,62 @@
package com.yxt.anrui.vehfleet.api;
import com.yxt.anrui.vehfleet.biz.affiliatedcompany.*;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/5/14 10:12
*/
@RestController
@RequestMapping("v1/affiliatedcompany")
public class AffiliatedCompanyRest {
@Autowired
AffiliatedCompanyService affiliatedCompanyService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AffiliatedCompanyVo>> listPage(@RequestBody PagerQuery<AffiliatedCompanyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AffiliatedCompanyVo> pv = affiliatedCompanyService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("查询全部")
@PostMapping("/list")
public ResultBean<List<AffiliatedCompany>> list() {
ResultBean rb = ResultBean.fireFail();
List<AffiliatedCompany> pv = affiliatedCompanyService.list();
return rb.success().setData(pv);
}
@ApiOperation("保存或者保存")
@PostMapping("/saveOrUpdate")
public ResultBean save(@RequestBody AffiliatedCompanyDto dto) {
return affiliatedCompanyService.saveOrUpdate(dto);
}
@ApiOperation("根据sid查询数据")
@GetMapping("/fetchSid/{sid}")
public ResultBean getEnterpriseBySid(@PathVariable String sid){
ResultBean rb = ResultBean.fireFail();
AffiliatedCompanyVo AffiliatedCompanyVo=affiliatedCompanyService.fetchSid(sid);
return rb.success().setData(AffiliatedCompanyVo);
}
@ApiOperation("删除")
@DeleteMapping("/delete/{sid}")
public ResultBean delete(@PathVariable String sid) {
return affiliatedCompanyService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
affiliatedCompanyService.delAll(sids);
return rb.success();
}
}

62
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/api/RegulatoryDocumentsRest.java

@ -0,0 +1,62 @@
package com.yxt.anrui.vehfleet.api;
import com.yxt.anrui.vehfleet.biz.regulatorydocuments.*;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/5/15 10:55
*/
@RestController
@RequestMapping("v1/regulatorydocuments")
public class RegulatoryDocumentsRest {
@Autowired
RegulatoryDocumentsService regulatoryDocumentsService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<RegulatoryDocumentsVo>> listPage(@RequestBody PagerQuery<RegulatoryDocumentsQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<RegulatoryDocumentsVo> pv = regulatoryDocumentsService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("查询全部")
@PostMapping("/list")
public ResultBean<List<RegulatoryDocuments>> list() {
ResultBean rb = ResultBean.fireFail();
List<RegulatoryDocuments> pv = regulatoryDocumentsService.list();
return rb.success().setData(pv);
}
@ApiOperation("保存或者保存")
@PostMapping("/saveOrUpdate")
public ResultBean save(@RequestBody RegulatoryDocumentsDto dto) {
return regulatoryDocumentsService.saveOrUpdate(dto);
}
@ApiOperation("根据sid查询数据")
@GetMapping("/fetchSid/{sid}")
public ResultBean getEnterpriseBySid(@PathVariable String sid){
ResultBean rb = ResultBean.fireFail();
RegulatoryDocumentsVo RegulatoryDocumentsVo=regulatoryDocumentsService.fetchSid(sid);
return rb.success().setData(RegulatoryDocumentsVo);
}
@ApiOperation("删除")
@DeleteMapping("/delete/{sid}")
public ResultBean delete(@PathVariable String sid) {
return regulatoryDocumentsService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
regulatoryDocumentsService.delAll(sids);
return rb.success();
}
}

19
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompany.java

@ -0,0 +1,19 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:12
*/
@Data
@ApiModel(value = "挂靠车辆", description = "挂靠车辆")
@TableName("affiliated_company")
public class AffiliatedCompany extends BaseEntity {
private String corporateName;//公司名称
private String contacts;//联系人
private String contactNumber;//联系方式
}

17
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyDto.java

@ -0,0 +1,17 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:38
*/
@ApiModel(value = "挂靠车辆 数据传输对象", description = "挂靠车辆 数据传输对象")
@Data
public class AffiliatedCompanyDto {
private String sid;
private String corporateName;//公司名称
private String contacts;//联系人
private String contactNumber;//联系方式
}

20
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyMapper.java

@ -0,0 +1,20 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/4/12 11:49
*/
@Mapper
public interface AffiliatedCompanyMapper extends BaseMapper<AffiliatedCompany> {
IPage<AffiliatedCompanyVo> selectPageVo(IPage<AffiliatedCompany> page, @Param(Constants.WRAPPER) Wrapper<AffiliatedCompany> qw);
AffiliatedCompanyVo fetchSid( @Param("sid") String sid);
}

19
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyMapper.xml

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.vehfleet.biz.affiliatedcompany.AffiliatedCompanyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.vehfleet.biz.affiliatedcompany.AffiliatedCompanyVo">
SELECT *
FROM affiliated_company
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchSid" resultType="com.yxt.anrui.vehfleet.biz.affiliatedcompany.AffiliatedCompanyVo">
SELECT *
FROM affiliated_company
WHERE sid=#{sid}
</select>
</mapper>

14
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyQuery.java

@ -0,0 +1,14 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:39
*/
@Data
public class AffiliatedCompanyQuery implements Query {
private String corporateName;//公司名称
}

68
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyService.java

@ -0,0 +1,68 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/4/12 11:50
*/
@Service
public class AffiliatedCompanyService extends MybatisBaseService<AffiliatedCompanyMapper, AffiliatedCompany> {
public PagerVo<AffiliatedCompanyVo> listPageVo(PagerQuery<AffiliatedCompanyQuery> pq) {
AffiliatedCompanyQuery query = pq.getParams();
QueryWrapper<AffiliatedCompany> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getCorporateName())){
qw.like("corporateName",query.getCorporateName());
}
IPage<AffiliatedCompany> page = PagerUtil.queryToPage(pq);
IPage<AffiliatedCompanyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AffiliatedCompanyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdate(AffiliatedCompanyDto dto) {
ResultBean rb=new ResultBean();
String sid =dto.getSid();
if(StringUtils.isNotBlank(sid)){
AffiliatedCompany entity=fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
return rb.success().setMsg("修改成功");
}else{
AffiliatedCompany entity=new AffiliatedCompany();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setMsg("保存成功");
}
}
public AffiliatedCompanyVo fetchSid(String sid){
//根据sid查询的企业
AffiliatedCompanyVo bank=baseMapper.fetchSid(sid);
return bank;
}
public ResultBean delete(String sid) {
ResultBean rb=new ResultBean();
baseMapper.delete(new QueryWrapper<AffiliatedCompany>().eq("sid",sid));
return rb.success().setMsg("删除成功");
}
public List<AffiliatedCompany> list(){
return baseMapper.selectList(new QueryWrapper<>());
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
return rb.success();
}
}

15
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyVo.java

@ -0,0 +1,15 @@
package com.yxt.anrui.vehfleet.biz.affiliatedcompany;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:38
*/
@Data
public class AffiliatedCompanyVo {
private String sid;
private String corporateName;//公司名称
private String contacts;//联系人
private String contactNumber;//联系方式
}

53
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/Appendix.java

@ -0,0 +1,53 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.vehfleet.biz.appendix;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "附件表", description = "附件表")
@TableName("appendix")
public class Appendix extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

52
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDetailsVo.java

@ -0,0 +1,52 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.vehfleet.biz.appendix;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "附件表 视图数据详情", description = "附件表 视图数据详情")
public class AppendixDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

52
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDto.java

@ -0,0 +1,52 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.vehfleet.biz.appendix;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "附件表 数据传输对象", description = "附件表 数据传输对象")
public class AppendixDto implements Dto {
private String sid; // sid
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

45
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.java

@ -0,0 +1,45 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.vehfleet.biz.appendix;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface AppendixMapper extends BaseMapper<Appendix> {
@Select("select * from appendix where linkSid = #{linkSid}")
List<Appendix> fetchByLinkSid(String linkSid);
int deleteByLinkSid(@Param("sid") String sid,@Param("fileType") String fileType);
@Select("select * from appendix where linkSid = #{linkSid} and fileType = #{fileType}")
List<Appendix> fetchByLinkSid2(@Param("linkSid") String linkSid, @Param("fileType") String type);
}

15
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.xml

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.vehfleet.biz.appendix.AppendixMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<delete id="deleteByLinkSid">
delete
from appendix
where linkSid = #{sid}
<if test="fileType != null and fileType != ''">
and fileType = #{fileType}
</if>
</delete>
</mapper>

107
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixService.java

@ -0,0 +1,107 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.vehfleet.biz.appendix;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class AppendixService extends MybatisBaseService<AppendixMapper, Appendix> {
@Autowired
private FileUploadComponent fileUploadComponent;
public List<Appendix> fetchByLinkSid(String linkSid) {
return baseMapper.fetchByLinkSid(linkSid);
}
public void saveOrUpdateFile(String sid, List<Appendix> oaAppendixList, String fileType) {
baseMapper.deleteByLinkSid(sid, fileType);
if (!oaAppendixList.isEmpty()) {
oaAppendixList.forEach(v -> {
baseMapper.insert(v);
});
}
}
public int deleteByLinkSid(String sid, String fileType) {
return baseMapper.deleteByLinkSid(sid, fileType);
}
public void saveFile(String sid, List<String> files, String attachType, String fileType) {
List<Appendix> oaAppendixList = new ArrayList<>();
if (!files.isEmpty()) {
for (String file : files) {
String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
Appendix oaAppendix = new Appendix();
oaAppendix.setLinkSid(sid);
oaAppendix.setAttachType(attachType);
oaAppendix.setFilePath(filePath);
/* File filess = new File(fileUploadComponent.getUploadPath() + file.replace("/", File.separator));
if (file != null) {
try {
boolean isTrue = ImageIO.read(filess) != null;
if (isTrue) {
oaAppendix.setFileType("图片");
} else {
oaAppendix.setFileType("文件");
}
} catch (IOException e) {
e.printStackTrace();
}
}*/
oaAppendix.setFileType(fileType);
oaAppendixList.add(oaAppendix);
}
}
saveOrUpdateFile(sid, oaAppendixList, fileType);
}
public List<String> selectByLinkSid(String sid) {
List<Appendix> fileList = fetchByLinkSid(sid);
List<String> files = new ArrayList<>();
for (Appendix oaAppendix : fileList) {
String url = fileUploadComponent.getUrlPrefix() + oaAppendix.getFilePath();
files.add(url);
}
return files;
}
public List<String> selectByLinkSid(String sid, String type) {
List<Appendix> fileList = baseMapper.fetchByLinkSid2(sid, type);
List<String> files = new ArrayList<>();
for (Appendix oaAppendix : fileList) {
String url = fileUploadComponent.getUrlPrefix() + oaAppendix.getFilePath();
files.add(url);
}
return files;
}
}

24
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocuments.java

@ -0,0 +1,24 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:12
*/
@Data
@ApiModel(value = "监管企业信息", description = "监管企业信息")
@TableName("regulatory_documents")
public class RegulatoryDocuments extends BaseEntity {
private String fileNameKey;//文件名
private String fileNameValue;
private String departmentKey;//监管部门
private String departmentValue;
private String fleetSid;//车队
private String fleetName;
private String uploaderSid;//上传人
private String uploaderName;
}

26
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsDto.java

@ -0,0 +1,26 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/5/14 10:38
*/
@ApiModel(value = "监管企业信息 数据传输对象", description = "监管企业信息 数据传输对象")
@Data
public class RegulatoryDocumentsDto {
private String sid;
private String remarks;
private String fileNameKey;//文件名
private String fileNameValue;
private String departmentKey;//监管部门
private String departmentValue;
private String fleetSid;//车队
private String fleetName;
private String uploaderSid;//上传人
private String uploaderName;
private List<String> filePaths;
}

18
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.java

@ -0,0 +1,18 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author wangpengfei
* @date 2023/4/12 11:49
*/
@Mapper
public interface RegulatoryDocumentsMapper extends BaseMapper<RegulatoryDocuments> {
IPage<RegulatoryDocumentsVo> selectPageVo(IPage<RegulatoryDocuments> page, @Param(Constants.WRAPPER) Wrapper<RegulatoryDocuments> qw);
RegulatoryDocumentsVo fetchSid(@Param("sid") String sid);
}

19
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.xml

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.vehfleet.biz.regulatorydocuments.RegulatoryDocumentsMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.vehfleet.biz.regulatorydocuments.RegulatoryDocumentsVo">
SELECT *
FROM regulatory_documents
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchSid" resultType="com.yxt.anrui.vehfleet.biz.regulatorydocuments.RegulatoryDocumentsVo">
SELECT *
FROM regulatory_documents
WHERE sid=#{sid}
</select>
</mapper>

23
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/5/14 10:39
*/
@Data
public class RegulatoryDocumentsQuery implements Query {
private String fileNameValue;//文件名
private String departmentValue;//部门
private String fleetSid;//车队
private String uploaderName;//上传人
private String remarks;//备注
private String endTime;
private String startTime;
}

99
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsService.java

@ -0,0 +1,99 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.vehfleet.biz.appendix.AppendixService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/4/12 11:50
*/
@Service
public class RegulatoryDocumentsService extends MybatisBaseService<RegulatoryDocumentsMapper, RegulatoryDocuments> {
@Autowired
AppendixService appendixService;
public PagerVo<RegulatoryDocumentsVo> listPageVo(PagerQuery<RegulatoryDocumentsQuery> pq) {
RegulatoryDocumentsQuery query = pq.getParams();
QueryWrapper<RegulatoryDocuments> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getFileNameValue())){
qw.eq("fileNameValue",query.getFileNameValue());
}
if(StringUtils.isNotBlank(query.getDepartmentValue())){
qw.eq("departmentValue",query.getDepartmentValue());
}
if(StringUtils.isNotBlank(query.getFleetSid())){
qw.eq("fleetSid",query.getFleetSid());
}
if(StringUtils.isNotBlank(query.getUploaderName())){
qw.like("uploaderName",query.getUploaderName());
}
if(StringUtils.isNotBlank(query.getRemarks())){
qw.like("remarks",query.getRemarks());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getStartTime() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
);
IPage<RegulatoryDocuments> page = PagerUtil.queryToPage(pq);
IPage<RegulatoryDocumentsVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<RegulatoryDocumentsVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdate(RegulatoryDocumentsDto dto) {
ResultBean rb=new ResultBean();
String sid =dto.getSid();
List<String> files = dto.getFilePaths();
if(StringUtils.isNotBlank(sid)){
RegulatoryDocuments entity=fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}else{
RegulatoryDocuments entity=new RegulatoryDocuments();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
sid=entity.getSid();
}
saveFiles(sid, files, "", "文件");
return rb.success().setMsg("成功");
}
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
appendixService.saveFile(sid, files, attachType, fileType);
}
public RegulatoryDocumentsVo fetchSid(String sid){
RegulatoryDocumentsVo bank=baseMapper.fetchSid(sid);
List<String> appes = appendixService.selectByLinkSid(sid, "文件");
bank.setFilePaths(appes);
return bank;
}
public ResultBean delete(String sid) {
ResultBean rb=new ResultBean();
baseMapper.delete(new QueryWrapper<RegulatoryDocuments>().eq("sid",sid));
return rb.success().setMsg("删除成功");
}
public List<RegulatoryDocuments> list(){
return baseMapper.selectList(new QueryWrapper<>());
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
appendixService.deleteByLinkSid(sid,"文件");
}
return rb.success();
}
}

29
yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsVo.java

@ -0,0 +1,29 @@
package com.yxt.anrui.vehfleet.biz.regulatorydocuments;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/5/14 10:38
*/
@Data
public class RegulatoryDocumentsVo {
private String sid;
private String remarks;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
private String fileNameKey;//文件名
private String fileNameValue;
private String departmentKey;//监管部门
private String departmentValue;
private String fleetSid;//车队
private String fleetName;
private String uploaderSid;//上传人
private String uploaderName;
private List<String> filePaths;
}

318
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@ -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();
@ -235,6 +239,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -256,7 +261,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员,请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
@ -357,43 +362,37 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
if (sysOrganization != null) {
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
//特殊处理
//获取调出方组织信息
SysOrganizationVo dcOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getOutPlatSid()).getData();
//获取调入方组织信息
SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
//流程预演
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
//获取下一环节审批角色
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
if (candidateGroups != null && candidateGroups.size() > 0){
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
bv.setOrgSidPath(dcOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
bv.setOrgSidPath(dcOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
}
}else if (bv.getTaskDefKey().equals("Activity_0kn4sub")){//调入方站长审批
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
@ -403,7 +402,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员,请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
@ -499,6 +498,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -641,11 +641,40 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "2");
variables.put("app", appMap);
//判断发起人是否为配件主管
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,10 +769,37 @@ 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);
appMap.put("type", "2");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
@ -817,8 +873,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 +920,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
@ -868,13 +976,40 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "2");
variables.put("app", appMap);
//判断发起人是否为配件主管
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()) {
@ -933,13 +1068,31 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "3");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
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,9 +1162,27 @@ 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);
appMap.put("type", "3");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
@ -1063,7 +1234,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 +1272,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
@ -1113,13 +1318,31 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "3");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
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 +1372,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();

2
yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java

@ -18,7 +18,7 @@ public enum ProcDefEnum {
WMSOTHEROUTAPPLY("其他出库(报损出库)", "process_iks2hour:1:14197560"),
WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),
WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"),
WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:2:20102504"),
;

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

@ -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

@ -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);
}
Loading…
Cancel
Save