Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 2 years ago
parent
commit
7a13c2f438
  1. 114
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
  2. 115
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java
  3. 115
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java
  4. 78
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelFeign.java
  5. 72
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelFeignFallback.java
  6. 62
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java
  7. 117
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java
  9. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java
  10. 65
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelMapper.java
  11. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelMapper.xml
  12. 100
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelRest.java
  13. 131
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java
  14. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  15. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java
  16. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
  17. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
  18. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
  19. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
  20. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  21. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
  22. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
  23. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java
  24. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java
  25. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java
  26. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/app/AppBusSalesOrderVehicleDto.java
  27. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrder.java
  28. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/app/AppBusSalesVehicleOrderDto.java
  29. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
  30. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  31. 37
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  32. 146
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  33. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  34. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
  35. 15
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
  36. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java
  37. 241
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  38. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  39. 16
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  40. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
  41. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeQuery.java
  42. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
  43. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  44. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
  45. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java
  46. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java
  47. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java
  48. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java
  49. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java
  50. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java
  51. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java

114
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java

@ -0,0 +1,114 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
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;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModel.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel <br/>
* Description: 挂车车型表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "挂车车型表", description = "挂车车型表")
@TableName("base_trailer_model")
public class BaseTrailerModel extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("厂商名称")
private String manufacturerName; // 厂商名称
@ApiModelProperty("挂车类型key")
private String trailerTypeKey; // 挂车类型key
@ApiModelProperty("挂车类型value")
private String trailerTypeValue; // 挂车类型value
@ApiModelProperty("外观尺寸长")
private String appearanceSizeLong; // 外观尺寸长
@ApiModelProperty("外观尺寸宽")
private String appearanceSizeWide; // 外观尺寸宽
@ApiModelProperty("外观尺寸高")
private String appearanceSizeHigh; // 外观尺寸高
@ApiModelProperty("外观尺寸总高")
private String appearanceSizeTotalHigh; // 外观尺寸总高
@ApiModelProperty("内部尺寸长")
private String insideSizeLong; // 内部尺寸长
@ApiModelProperty("内部尺寸宽")
private String insideSizeWide; // 内部尺寸宽
@ApiModelProperty("内部尺寸高")
private String insideSizeHigh; // 内部尺寸高
@ApiModelProperty("鞍座离地高度")
private String saddleLeaveLandHigh; // 鞍座离地高度
@ApiModelProperty("大梁尺寸高")
private String girderSizeHigh; // 大梁尺寸高
@ApiModelProperty("大梁尺寸宽")
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")
private String floorSize; // 底板
@ApiModelProperty("门扇要求")
private String doorFanRequirement; // 门扇要求
@ApiModelProperty("箱体颜色")
private String boxColor; // 箱体颜色
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("销售指导价(元)")
private String saleGuidancePrice; // 销售指导价(元)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

115
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java

@ -0,0 +1,115 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelVo.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo <br/>
* Description: 挂车车型表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "挂车车型表 视图数据详情", description = "挂车车型表 视图数据详情")
public class BaseTrailerModelDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("厂商名称")
private String manufacturerName; // 厂商名称
@ApiModelProperty("挂车类型key")
private String trailerTypeKey; // 挂车类型key
@ApiModelProperty("挂车类型value")
private String trailerTypeValue; // 挂车类型value
@ApiModelProperty("外观尺寸长")
private String appearanceSizeLong; // 外观尺寸长
@ApiModelProperty("外观尺寸宽")
private String appearanceSizeWide; // 外观尺寸宽
@ApiModelProperty("外观尺寸高")
private String appearanceSizeHigh; // 外观尺寸高
@ApiModelProperty("外观尺寸总高")
private String appearanceSizeTotalHigh; // 外观尺寸总高
@ApiModelProperty("内部尺寸长")
private String insideSizeLong; // 内部尺寸长
@ApiModelProperty("内部尺寸宽")
private String insideSizeWide; // 内部尺寸宽
@ApiModelProperty("内部尺寸高")
private String insideSizeHigh; // 内部尺寸高
@ApiModelProperty("鞍座离地高度")
private String saddleLeaveLandHigh; // 鞍座离地高度
@ApiModelProperty("大梁尺寸高")
private String girderSizeHigh; // 大梁尺寸高
@ApiModelProperty("大梁尺寸宽")
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")
private String floorSize; // 底板
@ApiModelProperty("门扇要求")
private String doorFanRequirement; // 门扇要求
@ApiModelProperty("箱体颜色")
private String boxColor; // 箱体颜色
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("销售指导价(元)")
private String saleGuidancePrice; // 销售指导价(元)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

115
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java

@ -0,0 +1,115 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelDto.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDto <br/>
* Description: 挂车车型表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "挂车车型表 数据传输对象", description = "挂车车型表 数据传输对象")
public class BaseTrailerModelDto implements Dto {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("厂商名称")
private String manufacturerName; // 厂商名称
@ApiModelProperty("挂车类型key")
private String trailerTypeKey; // 挂车类型key
@ApiModelProperty("挂车类型value")
private String trailerTypeValue; // 挂车类型value
@ApiModelProperty("外观尺寸长")
private String appearanceSizeLong; // 外观尺寸长
@ApiModelProperty("外观尺寸宽")
private String appearanceSizeWide; // 外观尺寸宽
@ApiModelProperty("外观尺寸高")
private String appearanceSizeHigh; // 外观尺寸高
@ApiModelProperty("外观尺寸总高")
private String appearanceSizeTotalHigh; // 外观尺寸总高
@ApiModelProperty("内部尺寸长")
private String insideSizeLong; // 内部尺寸长
@ApiModelProperty("内部尺寸宽")
private String insideSizeWide; // 内部尺寸宽
@ApiModelProperty("内部尺寸高")
private String insideSizeHigh; // 内部尺寸高
@ApiModelProperty("鞍座离地高度")
private String saddleLeaveLandHigh; // 鞍座离地高度
@ApiModelProperty("大梁尺寸高")
private String girderSizeHigh; // 大梁尺寸高
@ApiModelProperty("大梁尺寸宽")
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")
private String floorSize; // 底板
@ApiModelProperty("门扇要求")
private String doorFanRequirement; // 门扇要求
@ApiModelProperty("箱体颜色")
private String boxColor; // 箱体颜色
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("销售指导价(元)")
private String saleGuidancePrice; // 销售指导价(元)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

78
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelFeign.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelFeign.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeign <br/>
* Description: 挂车车型表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "挂车车型表")
@FeignClient(
contextId = "anrui-base-BaseTrailerModel",
name = "anrui-base",
path = "v1/basetrailermodel",
fallback = BaseTrailerModelFeignFallback.class)
public interface BaseTrailerModelFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseTrailerModelVo>> listPage(@RequestBody PagerQuery<BaseTrailerModelQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseTrailerModelDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseTrailerModelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelFeignFallback.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeignFallback <br/>
* Description: 挂车车型表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BaseTrailerModelFeignFallback implements BaseTrailerModelFeign {
@Override
public ResultBean<PagerVo<BaseTrailerModelVo>> listPage(PagerQuery<BaseTrailerModelQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basetrailermodel/listPage无法访问");
}
@Override
public ResultBean save(BaseTrailerModelDto dto){
return ResultBean.fireFail().setMsg("接口anrui-base/basetrailermodel/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-base/basetrailermodel/delBySids无法访问");
}
@Override
public ResultBean<BaseTrailerModelDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basetrailermodel/fetchDetailsBySid无法访问");
}
}

62
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java

@ -0,0 +1,62 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelQuery.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelQuery <br/>
* Description: 挂车车型表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "挂车车型表 查询条件", description = "挂车车型表 查询条件")
public class BaseTrailerModelQuery implements Query {
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("挂车类型key")
private String trailerTypeKey; // 挂车类型key
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
}

117
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java

@ -0,0 +1,117 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basetrailermodel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelVo.java <br/>
* Class: com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo <br/>
* Description: 挂车车型表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "挂车车型表 视图数据对象", description = "挂车车型表 视图数据对象")
public class BaseTrailerModelVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("厂商名称")
private String manufacturerName; // 厂商名称
@ApiModelProperty("挂车类型key")
private String trailerTypeKey; // 挂车类型key
@ApiModelProperty("挂车类型value")
private String trailerTypeValue; // 挂车类型value
@ApiModelProperty("外观尺寸长")
private String appearanceSizeLong; // 外观尺寸长
@ApiModelProperty("外观尺寸宽")
private String appearanceSizeWide; // 外观尺寸宽
@ApiModelProperty("外观尺寸高")
private String appearanceSizeHigh; // 外观尺寸高
@ApiModelProperty("外观尺寸总高")
private String appearanceSizeTotalHigh; // 外观尺寸总高
@ApiModelProperty("外观尺寸")
private String appearanceSize; // 外观尺寸
@ApiModelProperty("内部尺寸长")
private String insideSizeLong; // 内部尺寸长
@ApiModelProperty("内部尺寸宽")
private String insideSizeWide; // 内部尺寸宽
@ApiModelProperty("内部尺寸高")
private String insideSizeHigh; // 内部尺寸高
@ApiModelProperty("鞍座离地高度")
private String saddleLeaveLandHigh; // 鞍座离地高度
@ApiModelProperty("大梁尺寸高")
private String girderSizeHigh; // 大梁尺寸高
@ApiModelProperty("大梁尺寸宽")
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")
private String floorSize; // 底板
@ApiModelProperty("门扇要求")
private String doorFanRequirement; // 门扇要求
@ApiModelProperty("箱体颜色")
private String boxColor; // 箱体颜色
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("销售指导价(元)")
private String saleGuidancePrice; // 销售指导价(元)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java

@ -29,5 +29,7 @@ public class AppBaseVehicleOrderVo implements Vo {
@ApiModelProperty(value = "mysql数据库中查询是否是虚拟订单锁定")
private Boolean isFictitious;
private String topSid;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java

@ -28,4 +28,9 @@ public class AppBusVehicleApplyListVo implements Vo {
private String msg;
@ApiModelProperty(value = "锁定数量")
private String lockingNum;
@ApiModelProperty("上装sid")
private String topSid;
@ApiModelProperty("排产车型sid")
private String purchaseApplyMediumModelSid;
}

65
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelMapper.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basetrailermodel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo;
import java.util.List;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelMapper.java <br/>
* Class: com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelMapper <br/>
* Description: 挂车车型表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BaseTrailerModelMapper extends BaseMapper<BaseTrailerModel> {
//@Update("update base_trailer_model set name=#{msg} where id=#{id}")
//IPage<BaseTrailerModelVo> voPage(IPage<BaseTrailerModel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseTrailerModel> qw);
IPage<BaseTrailerModelVo> selectPageVo(IPage<BaseTrailerModel> page, @Param(Constants.WRAPPER) Wrapper<BaseTrailerModel> qw);
List<BaseTrailerModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseTrailerModel> qw);
@Select("select * from base_trailer_model")
List<BaseTrailerModelVo> selectListVo();
}

13
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelMapper.xml

@ -0,0 +1,13 @@
<?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.base.biz.basetrailermodel.BaseTrailerModelMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo">
SELECT * FROM base_trailer_model <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo">
SELECT * FROM base_trailer_model <where> ${ew.sqlSegment} </where>
</select>
</mapper>

100
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelRest.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basetrailermodel;
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.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelQuery;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDto;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeign;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelRest <br/>
* Description: 挂车车型表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "挂车车型表")
@RestController("com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelRest")
@RequestMapping("v1/basetrailermodel")
public class BaseTrailerModelRest implements BaseTrailerModelFeign {
@Autowired
private BaseTrailerModelService baseTrailerModelService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseTrailerModelVo>> listPage(@RequestBody PagerQuery<BaseTrailerModelQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseTrailerModelVo> pv = baseTrailerModelService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseTrailerModelDto dto){
ResultBean rb = ResultBean.fireFail();
baseTrailerModelService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseTrailerModelService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseTrailerModelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseTrailerModelDetailsVo vo = baseTrailerModelService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

131
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java

@ -0,0 +1,131 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basetrailermodel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
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 com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelQuery;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelVo;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDto;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(挂车车型管理) <br/>
* File: BaseTrailerModelService.java <br/>
* Class: com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService <br/>
* Description: 挂车车型表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-21 15:48:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseTrailerModelService extends MybatisBaseService<BaseTrailerModelMapper, BaseTrailerModel> {
private QueryWrapper<BaseTrailerModel> createQueryWrapper(BaseTrailerModelQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseTrailerModel> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseTrailerModelVo> listPageVo(PagerQuery<BaseTrailerModelQuery> pq) {
BaseTrailerModelQuery query = pq.getParams();
QueryWrapper<BaseTrailerModel> qw = new QueryWrapper<>();
qw.eq("useOrgSid",query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())){
qw.eq("brandSid",query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCarModelSid())){
qw.eq("carModelSid",query.getCarModelSid());
}
if (StringUtils.isNotBlank(query.getManufacturerSid())){
qw.eq("manufacturerSid",query.getManufacturerSid());
}
if (StringUtils.isNotBlank(query.getTrailerTypeKey())){
qw.eq("trailerTypeKey",query.getTrailerTypeKey());
}
IPage<BaseTrailerModel> page = PagerUtil.queryToPage(pq);
IPage<BaseTrailerModelVo> pagging = baseMapper.selectPageVo(page, qw);
for (BaseTrailerModelVo record : pagging.getRecords()) {
String appearanceSizeLong = record.getAppearanceSizeLong();
String appearanceSizeWide = record.getAppearanceSizeWide();
String appearanceSizeHigh = record.getAppearanceSizeHigh();
StringBuilder appearanceSize = new StringBuilder();
appearanceSize.append("长").append(appearanceSizeLong).append("mm,").append("宽").append(appearanceSizeWide).append("mm,").append("高").append(appearanceSizeHigh).append("mm");
record.setAppearanceSize(appearanceSize.toString());
}
PagerVo<BaseTrailerModelVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseTrailerModelDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseTrailerModelDto dto){
BaseTrailerModel entity = new BaseTrailerModel();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseTrailerModelDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseTrailerModel entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseTrailerModelDetailsVo fetchDetailsVoBySid(String sid){
BaseTrailerModel entity = fetchBySid(sid);
BaseTrailerModelDetailsVo vo = new BaseTrailerModelDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -18,6 +18,7 @@ import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@ -2034,6 +2035,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
} else {
orderVoList.get(i).setCertificate(true);
}
//查询车辆的上装配置
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin());
baseVehinstallsList.removeAll(Collections.singleton(null));
if(!baseVehinstallsList.isEmpty()){
BaseVehinstall baseVehinstall = baseVehinstallsList.get(0);
orderVoList.get(i).setTopSid(baseVehinstall.getMainSid());
}
}
return rb.success().setData(orderVoList);
}
@ -2053,6 +2061,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
} else {
orderVoList.get(i).setCertificate(true);
}
//查询车辆的上装配置
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin());
baseVehinstallsList.removeAll(Collections.singleton(null));
if(!baseVehinstallsList.isEmpty()){
BaseVehinstall baseVehinstall = baseVehinstallsList.get(0);
orderVoList.get(i).setTopSid(baseVehinstall.getMainSid());
}
}
return rb.success().setData(orderVoList);
}

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

@ -62,4 +62,6 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
@Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
List<String> selectListVo(String createOrgSid);
List<BaseVehinstall> selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@ -31,4 +31,8 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
SELECT * FROM base_vehinstall <where> ${ew.sqlSegment} </where>
</select>
<select id="selectByOrgSidAndVin" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
select * from base_vehinstall where useOrgSid = #{useOrgSid} and vinNo = #{vinNo}
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@ -209,4 +209,8 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseVehinstall> selectByOrgSidAndVin(String orgSid, String vin) {
return baseMapper.selectByOrgSidAndVin(orgSid,vin);
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@ -50,7 +50,7 @@
</select>
<select id="getAppApplyList" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo">
select bo.sid, bo.orderNo orderId, bo.orderDate date, bo.platformNo as totalNum, bo.lockingNum
select bo.sid, bo.orderNo orderId, bo.orderDate date, bo.platformNo as totalNum, bo.lockingNum,bo.purchaseApplyMediumModelSid
from bus_vehicle_apply_detail bd
left join bus_vehicle_apply bv
on bd.applySid = bv.sid

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@ -259,8 +259,18 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
public ResultBean<List<AppBusVehicleApplyListVo>> getAppApplyList(String modelSid, String configSid) {
ResultBean<List<AppBusVehicleApplyListVo>> rb = ResultBean.fireFail();
List<AppBusVehicleApplyListVo> voList = baseMapper.getAppApplyList(modelSid, configSid);
voList.removeAll(Collections.singleton(null));
if (voList.isEmpty()) {
return rb.setData(new ArrayList<>());
}else{
for (AppBusVehicleApplyListVo vo : voList){
String sid = vo.getPurchaseApplyMediumModelSid();
//根据排产车型查询上装信息是否存在
BusVehicleApplySzVo busVehicleApplySzVo = busVehicleApplySzService.selectByDetails(sid);
if(busVehicleApplySzVo != null){
vo.setTopSid(busVehicleApplySzVo.getSzSid());
}
}
}
return rb.success().setData(voList);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@ -260,8 +260,16 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
scmApplyInbound.setNodeState("待提交");
scmApplyInbound.setNum(dto.getPlatformNo());
String contractPrice = baseMapper.getContractPrice(dto.getPurchaseApplyMediumModelSid());
if(contractPrice != null){
if(StringUtils.isNotBlank(contractPrice)){
scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
}
}
/*
scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
*/
scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode());
scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java

@ -23,4 +23,7 @@ public class AppNowCarListVo implements Vo {
@ApiModelProperty("是否虚拟订单锁定的")
private String virtual;
@ApiModelProperty("上装sid")
private String topSid;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java

@ -22,4 +22,6 @@ public class AppNowCarVo implements Vo {
@ApiModelProperty("是否虚拟订单锁定的")
private String virtual;
@ApiModelProperty("上装配置sid")
private String topSid;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java

@ -29,5 +29,7 @@ public class AppReadyCarListVo implements Vo {
@ApiModelProperty("提示消息")
private String msg;
private String topSid;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java

@ -29,4 +29,7 @@ public class AppReadyCarVo implements Vo {
@ApiModelProperty("提示消息")
private String msg;
@ApiModelProperty("上装配置sid")
private String topSid;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@ -59,4 +59,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
@ApiModelProperty("车辆sid")
private String linkSid;
@ApiModelProperty("上装sid")
private String topSid;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/app/AppBusSalesOrderVehicleDto.java

@ -24,4 +24,7 @@ public class AppBusSalesOrderVehicleDto implements Dto {
@ApiModelProperty(value = "车辆sid")
// @JsonProperty(value = "carSid")
private String linkSid;
private String topSid;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrder.java

@ -62,4 +62,7 @@ public class BusSalesVehicleOrder extends BaseEntity {
@ApiModelProperty(value = "本次使用台数")
private Integer usingNum;
@ApiModelProperty("上装sid")
private String topSid;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/app/AppBusSalesVehicleOrderDto.java

@ -25,4 +25,6 @@ public class AppBusSalesVehicleOrderDto implements Dto {
// @JsonProperty(value = "selectNum")
private String usingNum;
private String topSid;
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@ -11,8 +11,8 @@
createTime AS virtualOrderDate,
deposit,
paymentDate AS payDate,
payType AS payTypeValue,
payTypeKey AS payType,
payType AS payType,
payTypeKey AS payTypeKey,
draweeName AS payName,
payBankAcc AS payNumber,
proBankValue AS collectionBank,

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@ -2050,9 +2050,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
BusMainDeposit busMainDeposit = fetchBySid(bv.getBusinessSid());
/*
String userSid = bv.getUserSid();
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
bv.setOrgSidPath(data.getOrgSidPath());
*/
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("virtualOrderSid", bv.getBusinessSid());

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

@ -63,7 +63,6 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
@ -129,7 +128,6 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -155,7 +153,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
@ -1837,6 +1834,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (orderInfo != null) {
//所有该车型下的现车的车架号集合
List<String> vinNoList = new ArrayList<>();
Map<String, Object> vinNoMap = new HashMap<>();
//所有该车型的采购订单所有编号的可使用数量集合:key:采购订单编号,value:该采购订单可使用数量
Map<String, Object> map = new HashMap<>();
//车型sid
@ -1860,6 +1858,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
//将该车型下的所有现车的车架号组合放入集合中
vinNoList.add(vehicleOrderVo.getVin());
vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
appNowCars.add(appNowCarVo);
}
@ -1880,6 +1879,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
AppNowCarVo appNowCarVo = new AppNowCarVo();
BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
vinNoList.add(vehicleOrderVo.getVin());
vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
appNowCars.add(appNowCarVo);
}
}
@ -1926,7 +1926,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
orderInfo.setNowCarList(nowCarList);
boolean isCheck = isCheck(vinNoList, nowCarList);
boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap);
if (isCheck) {
orderInfo.setNotice("当前车型已经更新,请进行确认");
}
@ -1982,7 +1982,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
* @param appNowCarList 选择的现车集合
* @return
*/
public Boolean isCheck(List<String> vinNoList, List<AppNowCarListVo> appNowCarList) {
public Boolean isCheck(List<String> vinNoList, List<AppNowCarListVo> appNowCarList, Map<String, Object> vinNoMap) {
Boolean isCheck = false;
for (AppNowCarListVo car : appNowCarList) {
String vinNo = car.getVin();
@ -1990,6 +1990,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
isCheck = true;
break;
}
String topSid = vinNoMap.get(vinNo).toString();
if (!topSid.equals(car.getTopSid())) {
isCheck = true;
break;
}
}
return isCheck;
}
@ -2403,7 +2409,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
boolean isMakeUp = isMakeUp(sid);
if(!isMakeUp){
if (!isMakeUp) {
return rb.setMsg("请完善上装信息");
}
boolean isPrice = isPrice(sid);
@ -2449,16 +2455,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
Boolean isMakeUp = true;
BusSalesOrder busSalesOrder = fetchBySid(sid);
BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(sid);
if(busSalesOrderModelDetailsVo != null){
if (busSalesOrderModelDetailsVo != null) {
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(busSalesOrderModelDetailsVo.getModelSid());
if(details.getData() != null){
if (details.getData() != null) {
String vehicleKey = details.getData().getVehicleType();
//(是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启,且为必填)
if("3".equals(vehicleKey)|| "005".equals(vehicleKey)||"7".equals(vehicleKey)||"5".equals(vehicleKey)){
if(busSalesOrder.getIsTop() == null){
if ("3".equals(vehicleKey) || "005".equals(vehicleKey) || "7".equals(vehicleKey) || "5".equals(vehicleKey)) {
if (busSalesOrder.getIsTop() == null) {
isMakeUp = false;
}else{
if("0".equals(busSalesOrder.getIsTop())){
} else {
if ("0".equals(busSalesOrder.getIsTop())) {
isMakeUp = false;
}
}
@ -2567,6 +2573,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (orderInfo != null) {
//该车型下的现车的车架号集合
List<String> vinNoList = new ArrayList<>();
Map<String,Object> vinNoMap = new HashMap<>();
String modelSid = orderInfo.getModelSid();
String configSid = orderInfo.getConfigSid();
String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(busSalesOrder.getStaffSid()).getData();
@ -2578,6 +2585,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (!voList.isEmpty()) {
for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
vinNoList.add(vehicleOrderVo.getVin());
vinNoMap.put(vehicleOrderVo.getVin(),vehicleOrderVo.getTopSid());
}
}
@ -2596,6 +2604,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (!voList.isEmpty()) {
for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
vinNoList.add(vehicleOrderVo.getVin());
vinNoMap.put(vehicleOrderVo.getVin(),vehicleOrderVo.getTopSid());
}
}
}
@ -2605,7 +2614,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(sid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
boolean isCheck = isCheck(vinNoList, nowCarList);
boolean isCheck = isCheck(vinNoList, nowCarList,vinNoMap);
if (isCheck) {
isVehicle = false;
}
@ -3097,7 +3106,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
busPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
busPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
busPurchaseChannelService.saveOrUpdateDto(busPurchaseChannelDto);

146
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@ -28,11 +28,16 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppReadyCarListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
@ -56,8 +61,11 @@ 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.List;
import java.util.TreeSet;
import java.util.stream.Collectors;
/**
* Project: anrui-buscenter(业务管理) <br/>
@ -91,6 +99,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
private BusSalesOrderDepositService busSalesOrderDepositService;
@Autowired
private BusDepositFictitiousService busDepositFictitiousService;
@Autowired
private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@ -154,6 +164,27 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
return rb.setMsg("该销售订单单据不存在");
}
AppOrderInfoDto orderInfo = dto.getOrderInfo();
List<AppBusSalesOrderVehicleDto> nowCarList1 = orderInfo.getNowCarList();
nowCarList1.removeAll(Collections.singleton(null));
List<String> topSidList = new ArrayList<>();
if (!nowCarList1.isEmpty()) {
topSidList = nowCarList1.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
topSidList = new ArrayList<>(new TreeSet<>(topSidList));
if (topSidList.size() > 1) {
return rb.setMsg("选择的车辆存在多种上装配置,不允许保存");
}
}
List<AppBusSalesVehicleOrderDto> readyCarList1 = orderInfo.getReadyCarList();
readyCarList1.removeAll(Collections.singleton(null));
if (!readyCarList1.isEmpty()) {
topSidList = new ArrayList<>();
topSidList = readyCarList1.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
topSidList = new ArrayList<>(new TreeSet<>(topSidList));
if (topSidList.size() > 1) {
return rb.setMsg("选择的订单存在多种上装配置,不允许保存");
}
}
String brandSid = "";
String brandName = "";
String modelAlias = "";
@ -187,6 +218,117 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderModel.setModelConfig(modelAlias);
updateById(busSalesOrderModel);
}
//添加上装信息===========
if (topSidList.size() > 0) {
String topSid = topSidList.get(0);
String topSidVin = "";
if ("0".equals(dto.getState())) {//现车
//判断是否与之前的相同,若相同则不用修改,若不同,则需要删除上装信息,重新添加一条
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
List<String> stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
//上装价格
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
}
}
}
}
if ("1".equals(dto.getState())) {//采购订单
List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
appReadyCarList.removeAll(Collections.singleton(null));
if (!appReadyCarList.isEmpty()) {
List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
//上装价格
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
}
}
}
}
}
//删除现车、采购订单的数据、若类型为现车,添加现车数据,若为采购订单,则新增采购订单数据
busSalesOrderVehicleService.deleteByOrderSid(salesOrderSid);
busSalesVehicleOrderService.deleteByOrderSid(salesOrderSid);
@ -257,14 +399,14 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
//计算总的结转金额
List<BusDepositFictitiousDetailsVo> depositFictitiousList = busDepositFictitiousService.detailsList(depositInfo.getSid());
depositFictitiousList.removeAll(Collections.singleton(null));
for (BusDepositFictitiousDetailsVo vo : depositFictitiousList){
for (BusDepositFictitiousDetailsVo vo : depositFictitiousList) {
bigDecimalSum = bigDecimalSum.add(new BigDecimal(vo.getPrice()));
}
bigDecimalSum = depositSum.subtract(bigDecimalSum);
}
}
//更新订金的订金合计
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid,bigDecimalSum);
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
}
return rb.success().setMsg("成功");

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@ -36,7 +36,8 @@
resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo">
select linkSid as carSid,
linkText as address,
linkNo as vin
linkNo as vin,
topSid
from bus_sales_order_vehicle
where salesOrderSid = #{saleOrderSid}
</select>

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@ -37,7 +37,8 @@
select linkNo as orderId,
linkText as date,
linkSid as sid,
usingNum as selectNum
usingNum as selectNum,
topSid
from bus_sales_vehicle_order
where salesOrderSid = #{saleOrderSid}
</select>
@ -49,10 +50,12 @@
</select>
<select id="selectByLinkSid" resultType="int">
select ifnull(sum(IFNULL(cast(bs.usingNum as signed),'0')),0)
select ifnull(sum(IFNULL(cast(bs.usingNum as signed), '0')), 0)
from bus_sales_vehicle_order bs
left join bus_sales_order bo on bo.sid = bs.salesOrderSid
where bs.linkSid = #{linkSid} and length(bo.nodeState)>0 and bo.nodeState != '销售订单申请'
left join bus_sales_order bo on bo.sid = bs.salesOrderSid
where bs.linkSid = #{linkSid}
and length(bo.nodeState) > 0
and bo.nodeState != '销售订单申请'
</select>
<select id="selectLinkSid" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">

15
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@ -286,7 +286,7 @@
<script>
import { save, dataDictionary, listAll, fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Upload from '@/components/uploadFile/filesUpload' //
import { getPathSidByUserSid, fetchBySid, selAccountByOrgSid } from '@/api/jichuxinxi/dictcommons'
import { selAccountByOrgSid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'acknowledgementReceiptAdd',
@ -308,6 +308,7 @@ export default {
formobj: {
sid: '',
createDept: '',
createDeptSid: '',
createDate: '',
createByName: '',
staffSid: '',
@ -378,15 +379,6 @@ export default {
}
},
DataDictionary() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
fetchBySid(resp.data).then((res) => {
if (res.success) {
this.formobj.createDept = res.data.name
}
})
}
})
dataDictionary({ type: 'receiptBank' }).then((res) => {
if (res.code === '200') {
this.receiptBank_list = res.data
@ -506,6 +498,8 @@ export default {
this.viewTitle = '【新建】收款确认申请'
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
this.formobj.createDept = window.sessionStorage.getItem('departmentName')
this.formobj.createDeptSid = window.sessionStorage.getItem('departmentSid')
this.getlist()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -656,6 +650,7 @@ export default {
this.formobj = {
sid: '',
createDept: '',
createDeptSid: '',
createDate: '',
createByName: '',
staffSid: '',

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java

@ -109,4 +109,6 @@ public class FinSelectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("应收未收款项sid")
private String receivablesSid;
private String sumAll;
}

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

@ -41,6 +41,8 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@ -58,9 +60,11 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -69,6 +73,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -127,6 +132,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private ArReceivebillService arReceivebillService;
@Autowired
private BusDepositFeign busDepositFeign;
@Autowired
private BdCustomerService bdCustomerService;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1245,6 +1254,129 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (confirmation == null) {
return rb.setMsg("该申请不存在");
}
//===========================================
//推送收款单
ARReceivebill arReceivebill = new ARReceivebill();
//业务日期
arReceivebill.setFDATE(DateUtil.today());
//收款组织
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFPAYORGID(vo.getOrgCode());
}
}
//销售部门
if (StringUtils.isNotBlank(confirmation.getCreateDeptSid())) {
resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFSALEDEPTID(vo.getOrgCode());
}
}
}
//物料列表
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1){
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
// BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("payType");
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid());
arReceivebill.setF_PAEZ_AssistantKey(finUncollectedReceivablesDetailed.getPayTypeKey());
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}
//推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金");
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos2.isEmpty()) {
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2){
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
// BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}
//简易订单-订金收取
if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) {
//先推送客户
AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),busDeposit.getPayName(),busDeposit.getPhone());
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
BigDecimal bigAll = confirmation.getCollectionMoney();
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途:订金
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
}
//===========================================
//查询该申请下的所有待审核的款项明细
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
@ -1351,98 +1483,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseMapper.updateById(confirmation);
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
//推送收款单
ARReceivebill arReceivebill = new ARReceivebill();
//业务日期
arReceivebill.setFDATE(DateUtil.today());
//往来单位
arReceivebill.setFCONTACTUNIT(confirmation.getPayerName());
//收款组织
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFPAYORGID(vo.getOrgCode());
}
}
//销售部门
resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFSALEDEPTID(vo.getOrgCode());
}
}
//应付类别key、value
//物料列表
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1,"车款");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
if(!finSelectedReceivablesDetailedVos1.isEmpty()){
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("paymentType");
BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
//推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1,"订金");
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
if(!finSelectedReceivablesDetailedVos2.isEmpty()){
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("paymentType");
BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
}
if(finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()){
fEntityList = new ArrayList<>();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
if(!finSelectedReceivablesDetailedVos2.isEmpty()){
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("paymentType");
BigDecimal bigAll = confirmation.getCollectionMoney();
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
}
}
/* baseMapper.cashierConfirm(sid);
int auditState = 1;
@ -1495,6 +1535,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/
return rb.success().setMsg("款项确认成功");
}
//组装客户推送
private BdCustomer createBdCustomer(String useOrgSid,String name,String mobile) {
BdCustomer bdCustomer = new BdCustomer();
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
bdCustomer.setTOrgIds(vo.getOrgCode());
}
}
String fname = name + mobile.substring(mobile.length() - 4);
bdCustomer.setFName(fname);
String code = HanZiConverterPinYin.getPinYinFirst(name) + mobile.substring(mobile.length() - 4);
bdCustomer.setFNumber(code);
return bdCustomer;
}
public ResultBean saveFinConfirm(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -122,10 +122,11 @@
<select id="fetchByAuditState1"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *
select *,sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
group by concat(customerName,customerPhone)
</select>
</mapper>

16
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -1970,13 +1970,17 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.singleResult();
flowTask.setProcessCreateTime(historicProcessInstance.getStartTime());
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId());
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
if(sysUserVoResultBean.getData() != null) {
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
}
ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid);
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid());
flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName());
if(sysUserVoResultBean2.getData() != null) {
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid());
flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName());
}
String procDefId = flowTask.getProcDefId();
String taskDefKey = flowTask.getTaskDefKey();
ResultBean<List<SysProUrlVo>> listResultBean = sysProUrlService.selectUrlByKey(procDefId, taskDefKey, "1", "2");

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@ -45,4 +45,6 @@ public class ScmVehicleReturnDetailsVo implements Vo {
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
private String instanceId;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeQuery.java

@ -22,4 +22,7 @@ public class GetNodeQuery implements Query {
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("业务sid")
private String businessSid;
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml

@ -17,7 +17,7 @@
</select>
<select id="details" resultType="com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo">
select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode,orgName,createBySid,createOrgSid,taskId
select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode,orgName,createBySid,createOrgSid,taskId,instanceId
from scm_vehicle_return
where sid = #{sid}
</select>

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@ -702,9 +702,16 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
BusinessVariables bv = new BusinessVariables();
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
bv.setTaskDefKey(query.getTaskDefKey());
bv.setFormVariables(BeanUtil.beanToMap(query));
String money = query.getFormVariables().get("money").toString();
bv.getFormVariables().put("isLoan", new BigDecimal(money).compareTo(new BigDecimal("0")) > 0);
if(StringUtils.isBlank(query.getBusinessSid())) {//pc
bv.setFormVariables(BeanUtil.beanToMap(query));
String money = query.getFormVariables().get("money").toString();
bv.getFormVariables().put("isLoan", new BigDecimal(money).compareTo(new BigDecimal("0")) > 0);
}else{//移动
ScmVehicleReturn scmVehicleReturn = fetchBySid(query.getBusinessSid());
Map<String,Object> map = new HashMap<>();
map.put("isLoan",scmVehicleReturn.getMoney().compareTo(new BigDecimal("0")) > 0);
bv.setFormVariables(map);
}
ResultBean<List<Map<String, Object>>> processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
processCirculationNodesByMap.setCode("200");
processCirculationNodesByMap.setSuccess(true);

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java

@ -27,4 +27,6 @@ public class NowCarVo implements Vo {
@ApiModelProperty("是否虚拟订单锁定的")
private String virtual;
@ApiModelProperty("上装配置sid")
private String topSid;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java

@ -50,4 +50,5 @@ public class OrderInfoVo implements Vo {
private String publicModelSid;
@ApiModelProperty("公告型号")
private String publicModel;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java

@ -33,4 +33,6 @@ public class ReadyCarVo implements Vo {
@ApiModelProperty("提示消息")
private String msg;
@ApiModelProperty("上装配置sid")
private String topSid;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java

@ -25,4 +25,6 @@ public class VehicleDto implements Dto {
@ApiModelProperty(value = "车辆sid")
@JsonProperty(value = "carSid")
private String linkSid;
private String topSid;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java

@ -26,4 +26,6 @@ public class VehicleOrderDto implements Dto {
@ApiModelProperty(value = "选择数量")
@JsonProperty(value = "selectNum")
private String usingNum;
private String topSid;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java

@ -14,6 +14,7 @@ public class DepositCompleteDto implements Dto {
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@JsonProperty("orgPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java

@ -15,6 +15,7 @@ public class VehicleCompleteDto implements Dto {
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@JsonProperty("orgPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java

@ -44,7 +44,7 @@ public class VehicleReturnDetailsVo implements Vo {
private String createOrgSid;
@ApiModelProperty(value = "taskId")
private String taskId;
@ApiModelProperty("procInsId")
@JsonProperty("procInsId")
private String instanceId;
}

Loading…
Cancel
Save