
39 changed files with 2949 additions and 21 deletions
@ -0,0 +1,96 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.yxt.common.core.domain.BaseEntity; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
|
|||
import java.math.BigDecimal; |
|||
import java.util.Date; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApply.java <br/> |
|||
* Class: com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApply <br/> |
|||
* Description: 结算申请. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:02 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "结算申请", description = "结算申请") |
|||
@TableName("as_bill_settel_apply") |
|||
public class AsBillSettelApply extends BaseEntity { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
@ApiModelProperty("申请人姓名") |
|||
private String createByName; // 申请人姓名
|
|||
@ApiModelProperty("申请部门sid") |
|||
private String deptSid; // 申请部门sid
|
|||
@ApiModelProperty("申请部门") |
|||
private String dept; // 申请部门
|
|||
@ApiModelProperty("来源sid(维修工单sid/销售单sid)") |
|||
private String sourceSid; // 来源sid(维修工单sid/销售单sid)
|
|||
@ApiModelProperty("0维修工单/1销售单") |
|||
private Integer sourceBillType; // 0维修工单/1销售单
|
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; // 使用组织sid
|
|||
@ApiModelProperty("使用组织名称") |
|||
private String useOrgName; // 使用组织名称
|
|||
@ApiModelProperty("taskId") |
|||
private String taskId; // taskId
|
|||
@ApiModelProperty("环节定义的sid") |
|||
private String nodeSid; // 环节定义的sid
|
|||
@ApiModelProperty("流程状态") |
|||
private String nodeState; // 流程状态
|
|||
@ApiModelProperty("流程实例的sid") |
|||
private String procInstId; // 流程实例的sid
|
|||
@ApiModelProperty("流程定义的id") |
|||
private String procDefId; // 流程定义的id
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@ApiModelProperty("办结时间") |
|||
private Date closeDate; // 办结时间
|
|||
@ApiModelProperty("应收金额") |
|||
private BigDecimal receivableAmount; // 应收金额
|
|||
@ApiModelProperty("结算金额") |
|||
private BigDecimal settleAmount; // 结算金额
|
|||
@ApiModelProperty("来源单编号") |
|||
private String sourceBillNo; // 来源单编号
|
|||
@ApiModelProperty("客户sid") |
|||
private String customerSid; // 客户sid
|
|||
@ApiModelProperty("客户名称") |
|||
private String customerName; // 客户名称
|
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; // 单据编号
|
|||
} |
@ -0,0 +1,244 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
|
|||
import com.yxt.anrui.as.api.asbusrepairbill.AitemVo; |
|||
import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo; |
|||
import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; |
|||
import com.yxt.anrui.as.api.utils.FileUrlQuery; |
|||
import com.yxt.common.core.vo.Vo; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyVo.java <br/> |
|||
* Class: com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo <br/> |
|||
* Description: 结算申请 视图数据对象. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:03 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "结算申请 视图数据详情", description = "结算申请 视图数据详情") |
|||
public class AsBillSettelApplyDetailsVo implements Vo { |
|||
|
|||
/** |
|||
* 附加费 |
|||
*/ |
|||
private String addAmount; |
|||
/** |
|||
* 附加项目 |
|||
*/ |
|||
private List<SettleAitemVo> aitemVos = new ArrayList<>(); |
|||
private List<String> fileName2 = new ArrayList<>(); |
|||
/** |
|||
* 申请日期 |
|||
*/ |
|||
private String applyDate; |
|||
/** |
|||
* 申请单编号 |
|||
*/ |
|||
private String billNo; |
|||
/** |
|||
* 维修单类型,维修单结算推送赋值,销售单结算推送空值 |
|||
*/ |
|||
private String billType; |
|||
/** |
|||
* 成本合计 |
|||
*/ |
|||
private String costAmount; |
|||
/** |
|||
* 申请人 |
|||
*/ |
|||
private String createByName; |
|||
/** |
|||
* 申请人Sid |
|||
*/ |
|||
private String createBySid; |
|||
/** |
|||
* 客户 |
|||
*/ |
|||
private String customerName; |
|||
/** |
|||
* 申请部门 |
|||
*/ |
|||
private String dept; |
|||
/** |
|||
* 申请部门Sid |
|||
*/ |
|||
private String deptSid; |
|||
/** |
|||
* 优惠,已沟通。需在维修单中增加该字段 |
|||
*/ |
|||
private String discountAmount; |
|||
/** |
|||
* 附件,附加项目 |
|||
*/ |
|||
private List<FileUrlQuery> fileName = new ArrayList<>(); |
|||
/** |
|||
* 材料费 |
|||
*/ |
|||
private String goodsAmount; |
|||
/** |
|||
* 商品 |
|||
*/ |
|||
private List<SettleGoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); |
|||
/** |
|||
* 工时费 |
|||
*/ |
|||
private String hourAmount; |
|||
private String instanceId; |
|||
/** |
|||
* 是否外出,同维修单类型一样 |
|||
*/ |
|||
private String isGoOut; |
|||
private String isGoOut2; |
|||
/** |
|||
* 是否开票 |
|||
*/ |
|||
private String isInvoicing; |
|||
private String isInvoicing2; |
|||
/** |
|||
* 联系电话 |
|||
*/ |
|||
private String mobile; |
|||
private String orgPath; |
|||
/** |
|||
* 外出费,附加项目 |
|||
*/ |
|||
private String outAmount; |
|||
/** |
|||
* 外出费开票金额,附加项目 |
|||
*/ |
|||
private String outKPAmount; |
|||
/** |
|||
* 外出费备注,附加项目 |
|||
*/ |
|||
private String outRemarks; |
|||
/** |
|||
* 利润额 |
|||
*/ |
|||
private String profit; |
|||
/** |
|||
* 应收合计 |
|||
*/ |
|||
private String receivableAmount; |
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
/** |
|||
* 施救费,附加项目 |
|||
*/ |
|||
private String rescueAmount; |
|||
/** |
|||
* 施救费开票金额,附加项目 |
|||
*/ |
|||
private String rescueKPAmount; |
|||
/** |
|||
* 施救费备注,附加项目 |
|||
*/ |
|||
private String rescueRemarks; |
|||
/** |
|||
* 结算金额 |
|||
*/ |
|||
private String settleAmount; |
|||
private String sid; |
|||
/** |
|||
* 维修项目 |
|||
*/ |
|||
private List<SettleSitemVo> sitemVos = new ArrayList<>(); |
|||
/** |
|||
* 单据日期 |
|||
*/ |
|||
private String sourceBillDate; |
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String sourceBillNo; |
|||
/** |
|||
* 单据编号Sid,来源单Sid |
|||
*/ |
|||
private String sourceSid; |
|||
/** |
|||
* 科目,同维修单类型一样 |
|||
*/ |
|||
private String subject; |
|||
/** |
|||
* 厂家补助,附加项目 |
|||
*/ |
|||
private String subsidyAmount; |
|||
/** |
|||
* 厂家补助开票金,附加项目 |
|||
*/ |
|||
private String subsidyKPAmount; |
|||
/** |
|||
* 厂家补助备注,附加项目 |
|||
*/ |
|||
private String subsidyRemarks; |
|||
private String taskId; |
|||
/** |
|||
* 加税点项目,同维修单类型一样 |
|||
*/ |
|||
private String taxItems; |
|||
/** |
|||
* 税率 |
|||
*/ |
|||
private String taxRate; |
|||
/** |
|||
* 分公司 |
|||
*/ |
|||
private String useOrgName; |
|||
/** |
|||
* 分公司Sid |
|||
*/ |
|||
private String useOrgSid; |
|||
/** |
|||
* 车牌号 |
|||
*/ |
|||
private String vehMark; |
|||
/** |
|||
* 车架号 |
|||
*/ |
|||
private String vinNo; |
|||
/** |
|||
* 服务顾问 |
|||
*/ |
|||
private String waitorName; |
|||
|
|||
private String procInsId; |
|||
|
|||
} |
@ -0,0 +1,90 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
|
|||
import com.yxt.common.core.dto.Dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
|
|||
import java.math.BigDecimal; |
|||
import java.util.Date; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyDto.java <br/> |
|||
* Class: com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto <br/> |
|||
* Description: 结算申请 数据传输对象. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:02 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "结算申请 数据传输对象", description = "结算申请 数据传输对象") |
|||
public class AsBillSettelApplyDto implements Dto { |
|||
|
|||
private String sid; // sid
|
|||
private String createBySid; // sid
|
|||
private String remarks; |
|||
@ApiModelProperty("记录创建时间") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|||
private Date createTime = new Date(); |
|||
@ApiModelProperty("申请人姓名") |
|||
private String createByName; // 申请人姓名
|
|||
@ApiModelProperty("申请部门sid") |
|||
private String deptSid; // 申请部门sid
|
|||
@ApiModelProperty("申请部门") |
|||
private String dept; // 申请部门
|
|||
@ApiModelProperty("来源sid(维修工单sid/销售单sid)") |
|||
private String sourceSid; // 来源sid(维修工单sid/销售单sid)
|
|||
@ApiModelProperty("0维修工单/1销售单") |
|||
private Integer sourceBillType; // 0维修工单/1销售单
|
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; // 使用组织sid
|
|||
@ApiModelProperty("使用组织名称") |
|||
private String useOrgName; // 使用组织名称
|
|||
@ApiModelProperty("流程状态") |
|||
private String nodeState; // 流程状态
|
|||
@ApiModelProperty("应收金额") |
|||
private String receivableAmount; // 应收金额
|
|||
@ApiModelProperty("结算金额") |
|||
private String settleAmount; // 结算金额
|
|||
@ApiModelProperty("来源单编号") |
|||
private String sourceBillNo; // 来源单编号
|
|||
@ApiModelProperty("客户sid") |
|||
private String customerSid; // 客户sid
|
|||
@ApiModelProperty("客户名称") |
|||
private String customerName; // 客户名称
|
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; // 单据编号
|
|||
} |
@ -0,0 +1,68 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import java.util.Date; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyQuery.java <br/> |
|||
* Class: com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyQuery <br/> |
|||
* Description: 结算申请 查询条件. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:02 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "结算申请 查询条件", description = "结算申请 查询条件") |
|||
public class AsBillSettelApplyQuery implements Query { |
|||
|
|||
private String applyDateEnd; |
|||
private String applyDateStart; |
|||
private String billNo; |
|||
private String closeDateEnd; |
|||
private String closeDateStart; |
|||
private String createByName; |
|||
private String customerName; |
|||
private String dept; |
|||
private String menuUrl; |
|||
private String orgPath; |
|||
private String sourceBillNo; |
|||
private String useOrgName; |
|||
private String userSid; |
|||
|
|||
} |
@ -0,0 +1,99 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import java.util.Date; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyVo.java <br/> |
|||
* Class: com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo <br/> |
|||
* Description: 结算申请 视图数据对象. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:02 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "结算申请 视图数据对象", description = "结算申请 视图数据对象") |
|||
public class AsBillSettelApplyVo implements Vo { |
|||
|
|||
/** |
|||
* 创建日期 |
|||
*/ |
|||
private String applyDate; |
|||
/** |
|||
* 申请单编号,结算申请编号 |
|||
*/ |
|||
private String billNo; |
|||
/** |
|||
* 办结日期 |
|||
*/ |
|||
private String closeDate; |
|||
/** |
|||
* 申请人 |
|||
*/ |
|||
private String createByName; |
|||
/** |
|||
* 客户名称 |
|||
*/ |
|||
private String customerName; |
|||
/** |
|||
* 申请部门 |
|||
*/ |
|||
private String dept; |
|||
private String nodeState; |
|||
private String procDefId; |
|||
private String procInstId; |
|||
/** |
|||
* 应收合计 |
|||
*/ |
|||
private String receivableAmount; |
|||
/** |
|||
* 结算金额 |
|||
*/ |
|||
private String settleAmount; |
|||
private String sid; |
|||
/** |
|||
* 单据编号,维修单号或销售单号 |
|||
*/ |
|||
private String sourceBillNo; |
|||
/** |
|||
* 分公司 |
|||
*/ |
|||
private String useOrgName; |
|||
|
|||
} |
@ -0,0 +1,36 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/8/16 14:00 |
|||
*/ |
|||
@Data |
|||
public class SettleAitemVo { |
|||
|
|||
/** |
|||
* 成本 |
|||
*/ |
|||
private String aitemCost; |
|||
/** |
|||
* 其它附加项目 |
|||
*/ |
|||
private String aitemName; |
|||
/** |
|||
* 利润额 |
|||
*/ |
|||
private String aitemPrint; |
|||
/** |
|||
* 应收金额,销售价 |
|||
*/ |
|||
private String aitemReceivableAmount; |
|||
private String aitemsid; |
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
private String attachItemSid; |
|||
|
|||
} |
@ -0,0 +1,47 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/8/16 14:09 |
|||
*/ |
|||
@Data |
|||
public class SettleGoodsDetailsVo { |
|||
/** |
|||
* 优惠金额 |
|||
*/ |
|||
private String discountAmount; |
|||
/** |
|||
* 成本 |
|||
*/ |
|||
private String goodsCost; |
|||
/** |
|||
* 利润额,结算金额 - 成本 |
|||
*/ |
|||
private String goodsPrint; |
|||
/** |
|||
* 应收金额,销售价 * 数量 |
|||
*/ |
|||
private String goodsReceivableAmount; |
|||
/** |
|||
* 结算金额,应收金额 - 优惠金额 |
|||
*/ |
|||
private String goodsSettleAmount; |
|||
/** |
|||
* 图号 |
|||
*/ |
|||
private String goodsSkuCode; |
|||
/** |
|||
* 商品名称 |
|||
*/ |
|||
private String goodsSpuName; |
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
private String sid; |
|||
private String inventorySid; |
|||
private String goodsID; |
|||
} |
@ -0,0 +1,54 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/8/16 13:58 |
|||
*/ |
|||
@Data |
|||
public class SettleSitemVo { |
|||
private String serviceItemSid; |
|||
/** |
|||
* 优惠金额 |
|||
*/ |
|||
private String discountAmount; |
|||
/** |
|||
* 工时单价 |
|||
*/ |
|||
private String hourPrice; |
|||
/** |
|||
* 工时数 |
|||
*/ |
|||
private String hours; |
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remarks; |
|||
/** |
|||
* 维修项目名称 |
|||
*/ |
|||
private String serviceItem; |
|||
/** |
|||
* 工种 |
|||
*/ |
|||
private String serviceType; |
|||
private String serviceTypeSid; |
|||
/** |
|||
* 成本 |
|||
*/ |
|||
private String sitemCost; |
|||
/** |
|||
* 利润额,结算金额 - 成本 |
|||
*/ |
|||
private String sitemPrint; |
|||
/** |
|||
* 应收合计,销售价 |
|||
*/ |
|||
private String sitemReceivableAmount; |
|||
/** |
|||
* 结算金额,应收金额 - 优惠金额 |
|||
*/ |
|||
private String sitemSettleAmount; |
|||
} |
@ -0,0 +1,37 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import com.yxt.common.core.dto.Dto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/9/6 14:57 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class SettleCompleteDto implements Dto { |
|||
private static final long serialVersionUID = 6378752532534735663L; |
|||
|
|||
@ApiModelProperty(value = "用户sid") |
|||
private String userSid; |
|||
@ApiModelProperty(value = "节点id") |
|||
@NotBlank(message = "参数错误:taskDefKey") |
|||
private String taskDefKey; |
|||
@ApiModelProperty(value = "任务id") |
|||
@NotBlank(message = "参数错误:taskId") |
|||
private String taskId; |
|||
@ApiModelProperty(value = "流程id(PC)") |
|||
private String instanceId; |
|||
@ApiModelProperty(value = "流程id(移动)") |
|||
private String procInsId; |
|||
@ApiModelProperty(value = "意见") |
|||
private String comment; |
|||
@ApiModelProperty(value = "业务sid") |
|||
@NotBlank(message = "参数错误:businessSid") |
|||
private String businessSid; |
|||
|
|||
private String orgPath; |
|||
} |
@ -0,0 +1,26 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/9/28 9:28 |
|||
*/ |
|||
@Data |
|||
public class SettleDelegateQuery { |
|||
@ApiModelProperty |
|||
private String userSid; |
|||
@ApiModelProperty("流程实例id") |
|||
// @JsonProperty("procInsId")
|
|||
private String instanceId; |
|||
@ApiModelProperty("任务Id") |
|||
private String taskId; |
|||
@ApiModelProperty("审批人sid") |
|||
private String assignee; |
|||
@ApiModelProperty("填写意见") |
|||
private String views; |
|||
|
|||
|
|||
} |
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/9/6 15:04 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class SettleNodeQuery implements Query { |
|||
private static final long serialVersionUID = 9117613683840483366L; |
|||
|
|||
@ApiModelProperty(value = "环节定义id") |
|||
@NotBlank(message = "参数错误:taskDefKey") |
|||
private String taskDefKey; |
|||
@ApiModelProperty(value = "业务sid") |
|||
private String businessSid; |
|||
@ApiModelProperty(value = "0 上一环节 1下一环节") |
|||
private Integer next; |
|||
} |
@ -0,0 +1,26 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/9/6 15:03 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class SettleNodeVo implements Vo { |
|||
private static final long serialVersionUID = -833419512294877848L; |
|||
|
|||
@ApiModelProperty(value = "节点名称") |
|||
private String name; |
|||
@ApiModelProperty(value = "节点id") |
|||
private String id; |
|||
@ApiModelProperty(value = "审批组") |
|||
private List<String> candidateGroups; |
|||
@ApiModelProperty(value = "是否是最后环节") |
|||
private String endTask; |
|||
} |
@ -0,0 +1,48 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/9/6 15:06 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class SettleTaskQuery implements Query { |
|||
private static final long serialVersionUID = 1288615499873178778L; |
|||
|
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("任务Id") |
|||
@NotBlank(message = "参数错误:taskId") |
|||
private String taskId; |
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("业务sid") |
|||
@NotBlank(message = "参数错误:businessSid") |
|||
private String businessSid; |
|||
/** |
|||
* 终止、驳回 |
|||
*/ |
|||
@ApiModelProperty("任务意见") |
|||
private String comment; |
|||
/** |
|||
* 终止、撤回、驳回 |
|||
*/ |
|||
@ApiModelProperty("用户Sid") |
|||
private String userSid; |
|||
/** |
|||
* 终止 |
|||
*/ |
|||
@ApiModelProperty("流程实例Id(PC)") |
|||
private String instanceId; |
|||
|
|||
@ApiModelProperty("流程实例Id(移动)") |
|||
private String procInsId; |
|||
} |
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow; |
|||
|
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; |
|||
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.AsBusrepairBillReverseSettleDto; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author liuguohui |
|||
* @version 1.0 |
|||
* @description |
|||
* @date 2022/04/13 |
|||
*/ |
|||
@ApiModel("提交") |
|||
@Data |
|||
public class SubmitSettleDto extends AsBillSettelApplyDto { |
|||
|
|||
@ApiModelProperty("意见") |
|||
private String comment; |
|||
@ApiModelProperty("流程实例id") |
|||
private String instanceId; |
|||
@ApiModelProperty("任务id") |
|||
private String taskId; |
|||
} |
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow.app; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/9/28 10:16 |
|||
*/ |
|||
@Data |
|||
public class AppSettleDelegateQuery { |
|||
@ApiModelProperty |
|||
private String userSid; |
|||
@ApiModelProperty("流程实例id") |
|||
@JsonProperty("procInsId") |
|||
private String instanceId; |
|||
@ApiModelProperty("任务Id") |
|||
private String taskId; |
|||
@ApiModelProperty("审批人sid") |
|||
private String assignee; |
|||
@ApiModelProperty("填写意见") |
|||
private String views; |
|||
} |
@ -0,0 +1,46 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow.app; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/10/17 9:14 |
|||
*/ |
|||
@Data |
|||
public class AppSettleTaskQuery implements Query { |
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("任务Id") |
|||
@NotBlank(message = "参数错误:taskId") |
|||
private String taskId; |
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("业务sid") |
|||
@NotBlank(message = "参数错误:businessSid") |
|||
private String businessSid; |
|||
/** |
|||
* 终止、驳回 |
|||
*/ |
|||
@ApiModelProperty("任务意见") |
|||
private String comment; |
|||
/** |
|||
* 终止、撤回、驳回 |
|||
*/ |
|||
@ApiModelProperty("用户Sid") |
|||
private String userSid; |
|||
/** |
|||
* 终止 |
|||
*/ |
|||
@ApiModelProperty("流程实例Id") |
|||
@JsonProperty("procInsId") |
|||
private String instanceId; |
|||
|
|||
} |
@ -0,0 +1,35 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow.app; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import com.yxt.common.core.dto.Dto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/10/17 9:13 |
|||
*/ |
|||
@Data |
|||
public class CompleteSettleDto implements Dto { |
|||
@ApiModelProperty(value = "任务id") |
|||
@NotBlank(message = "参数错误:taskId") |
|||
private String taskId; |
|||
@ApiModelProperty(value = "流程id") |
|||
@NotBlank(message = "参数错误:procInsId") |
|||
@JsonProperty("procInsId") |
|||
private String instanceId; |
|||
@ApiModelProperty(value = "意见") |
|||
private String comment; |
|||
@ApiModelProperty(value = "业务sid") |
|||
@NotBlank(message = "参数错误:businessSid") |
|||
private String businessSid; |
|||
@ApiModelProperty(value = "用户sid") |
|||
@NotBlank(message = "参数错误:userSid") |
|||
private String userSid; |
|||
@ApiModelProperty(value = "节点id") |
|||
@NotBlank(message = "参数错误:taskDefKey") |
|||
private String taskDefKey; |
|||
} |
@ -0,0 +1,21 @@ |
|||
package com.yxt.anrui.as.api.asbillsettelapply.flow.app; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
|
|||
@Data |
|||
public class SettleFlowableQuery implements Query { |
|||
private static final long serialVersionUID = -5879668616710833830L; |
|||
|
|||
@ApiModelProperty(value = "节点key") |
|||
private String taskDefKey; |
|||
@ApiModelProperty(value = "业务sid") |
|||
private String businessSid; |
|||
@ApiModelProperty(value = "0 上一环节 1下一环节") |
|||
@NotNull(message = "参数错误:next") |
|||
private Integer next; |
|||
|
|||
} |
@ -0,0 +1,70 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.biz.asbillsettelapply; |
|||
|
|||
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.as.api.asbillsettelapply.AsBillSettelApply; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyMapper.java <br/> |
|||
* Class: com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyMapper <br/> |
|||
* Description: 结算申请. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:03 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Mapper |
|||
public interface AsBillSettelApplyMapper extends BaseMapper<AsBillSettelApply> { |
|||
|
|||
//@Update("update as_bill_settel_apply set name=#{msg} where id=#{id}")
|
|||
//IPage<AsBillSettelApplyVo> voPage(IPage<AsBillSettelApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsBillSettelApply> qw);
|
|||
|
|||
IPage<AsBillSettelApplyVo> selectPageVo(IPage<AsBillSettelApply> page, @Param(Constants.WRAPPER) Wrapper<AsBillSettelApply> qw); |
|||
|
|||
List<AsBillSettelApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBillSettelApply> qw); |
|||
|
|||
@Select("select * from as_bill_settel_apply") |
|||
List<AsBillSettelApplyVo> selectListVo(); |
|||
|
|||
int selectNum(String bill); |
|||
|
|||
int updateFlowFiled(Map<String, Object> map); |
|||
} |
@ -0,0 +1,55 @@ |
|||
<?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.as.biz.asbillsettelapply.AsBillSettelApplyMapper"> |
|||
<update id="updateFlowFiled"> |
|||
UPDATE as_bill_settel_apply |
|||
SET nodeState=#{nodeState} |
|||
, nodeSid=#{taskDefKey} |
|||
<if test="procDefId != null and procDefId != ''"> |
|||
, procDefId=#{procDefId} |
|||
</if> |
|||
<if test="procInsId != null and procInsId != ''"> |
|||
, procInstId=#{procInsId} |
|||
</if> |
|||
<if test="taskId != null and taskId != ''"> |
|||
, taskId=#{taskId} |
|||
</if> |
|||
WHERE sid = #{sid} |
|||
</update> |
|||
<!-- <where> ${ew.sqlSegment} </where>--> |
|||
<!-- ${ew.customSqlSegment} --> |
|||
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo"> |
|||
SELECT |
|||
b.sid, |
|||
b.billNo, |
|||
b.nodeState, |
|||
so.`name` useOrgName, |
|||
b.dept, |
|||
b.createByName, |
|||
DATE_FORMAT( b.createTime, '%Y-%m-%d' ) AS applyDate, |
|||
DATE_FORMAT( b.closeDate, '%Y-%m-%d' ) AS closeDate, |
|||
b.sourceBillNo, |
|||
b.customerName, |
|||
b.receivableAmount, |
|||
b.settleAmount, |
|||
b.procInstId, |
|||
b.procDefId |
|||
FROM |
|||
as_bill_settel_apply AS b |
|||
LEFT JOIN anrui_portal.sys_organization AS s ON b.deptSid = s.sid |
|||
LEFT JOIN anrui_portal.sys_organization AS so ON b.useOrgSid = so.sid |
|||
<where> |
|||
${ew.sqlSegment} |
|||
</where> |
|||
</select> |
|||
|
|||
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo"> |
|||
SELECT * FROM as_bill_settel_apply |
|||
<where>${ew.sqlSegment}</where> |
|||
</select> |
|||
<select id="selectNum" resultType="java.lang.Integer"> |
|||
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code |
|||
from as_bill_settel_apply |
|||
where billNo LIKE concat(#{bill}, '%') |
|||
</select> |
|||
</mapper> |
@ -0,0 +1,217 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.biz.asbillsettelapply; |
|||
|
|||
import cn.hutool.core.bean.BeanUtil; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.flow.*; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery; |
|||
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.flowable.*; |
|||
import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; |
|||
import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum; |
|||
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.cloud.openfeign.SpringQueryMap; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyQuery; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyVo; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDetailsVo; |
|||
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; |
|||
|
|||
import javax.validation.Valid; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* Project: settle(结算申请) <br/> |
|||
* File: AsBillSettelApplyFeignFallback.java <br/> |
|||
* Class: com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyRest <br/> |
|||
* Description: 结算申请. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-08-15 16:25:03 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Api(tags = "结算申请") |
|||
@RestController("com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyRest") |
|||
@RequestMapping("v1/settleaccounts") |
|||
public class AsBillSettelApplyRest { |
|||
|
|||
@Autowired |
|||
private AsBillSettelApplyService asBillSettelApplyService; |
|||
|
|||
|
|||
@ApiOperation("根据条件分页查询数据的列表") |
|||
@PostMapping("/listPage") |
|||
public ResultBean<PagerVo<AsBillSettelApplyVo>> listPage(@RequestBody PagerQuery<AsBillSettelApplyQuery> pq){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
PagerVo<AsBillSettelApplyVo> pv = asBillSettelApplyService.listPageVo(pq); |
|||
return rb.success().setData(pv); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("新增或修改") |
|||
@PostMapping("/save") |
|||
public ResultBean save(@RequestBody AsBillSettelApplyDto dto){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
asBillSettelApplyService.saveOrUpdateDto(dto); |
|||
return rb.success(); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("根据sid批量删除") |
|||
@PostMapping("/delBySids") |
|||
public ResultBean delBySids(@RequestBody String[] sids){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
asBillSettelApplyService.delBySids(sids); |
|||
return rb.success(); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("根据SID获取一条记录") |
|||
@GetMapping("/fetchDetailsBySid/{sid}") |
|||
public ResultBean<AsBillSettelApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
AsBillSettelApplyDetailsVo vo = asBillSettelApplyService.fetchDetailsVoBySid(sid); |
|||
return rb.success().setData(vo); |
|||
} |
|||
@ApiOperation("app详情") |
|||
@GetMapping("/fetchDetailsBySid2/{sid}") |
|||
public ResultBean<AsBillSettelApplyDetailsVo> fetchDetailsBySid2(@PathVariable("sid") String sid){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
AsBillSettelApplyDetailsVo vo = asBillSettelApplyService.fetchDetailsVoBySid(sid); |
|||
return rb.success().setData(vo); |
|||
} |
|||
//---------------------------------flow----------------------------------------
|
|||
@ApiOperation("提交审批流程") |
|||
@PostMapping("/submit") |
|||
public ResultBean submit(@RequestBody @Valid SubmitSettleDto dto) { |
|||
return asBillSettelApplyService.submit(dto); |
|||
} |
|||
|
|||
@ApiOperation(value = "办理(同意)") |
|||
@PostMapping("/complete") |
|||
public ResultBean complete(@Valid @RequestBody SettleCompleteDto query) { |
|||
BusinessVariables bv = new BusinessVariables(); |
|||
BeanUtil.copyProperties(query, bv); |
|||
bv.setModelId(ProcDefEnum.BILLSETTLEAPPLY.getProDefId()); |
|||
return asBillSettelApplyService.complete(bv); |
|||
} |
|||
|
|||
@ApiOperation(value = "获取上一个环节") |
|||
@GetMapping(value = "/getPreviousNodesForReject") |
|||
public ResultBean<List<SettleNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SettleNodeQuery query) { |
|||
return asBillSettelApplyService.getPreviousNodesForReject(query); |
|||
} |
|||
|
|||
@ApiOperation(value = "获取下一个环节") |
|||
@GetMapping(value = "/getNextNodesForSubmit") |
|||
public ResultBean<List<SettleNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap SettleNodeQuery query) { |
|||
return asBillSettelApplyService.getNextNodesForSubmit(query); |
|||
} |
|||
|
|||
@ApiOperation(value = "驳回任务") |
|||
@PostMapping(value = "/reject") |
|||
public ResultBean reject(@Valid @RequestBody SettleTaskQuery query) { |
|||
return asBillSettelApplyService.reject(query); |
|||
} |
|||
|
|||
@ApiOperation(value = "撤回流程") |
|||
@PostMapping(value = "/revokeProcess") |
|||
public ResultBean revokeProcess(@Valid @RequestBody SettleTaskQuery query) { |
|||
return asBillSettelApplyService.revokeProcess(query); |
|||
} |
|||
|
|||
@ApiOperation(value = "终止任务") |
|||
@PostMapping(value = "/breakProcess") |
|||
public ResultBean breakProcess(@Valid @RequestBody SettleTaskQuery query) { |
|||
return asBillSettelApplyService.breakProcess(query); |
|||
} |
|||
|
|||
@ApiOperation(value = "加签") |
|||
@PostMapping(value = "/delegateProcess") |
|||
public ResultBean delegateProcess(@RequestBody SettleDelegateQuery query) { |
|||
return asBillSettelApplyService.delegate(query); |
|||
} |
|||
|
|||
//---------------- app ---------------------
|
|||
@ApiOperation("办理") |
|||
@PutMapping("/agreeCreditInfo") |
|||
@ResponseBody |
|||
ResultBean agreeCreditInfo(@Valid @RequestBody CompleteSettleDto dto){ |
|||
return asBillSettelApplyService.agreeCreditInfo(dto); |
|||
} |
|||
|
|||
@ApiOperation("驳回") |
|||
@PutMapping("/rejectCreditInfo") |
|||
@ResponseBody |
|||
ResultBean rejectCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){ |
|||
return asBillSettelApplyService.rejectCreditInfo(query); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("撤回") |
|||
@PutMapping("/recallCreditInfo") |
|||
@ResponseBody |
|||
ResultBean recallCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){ |
|||
return asBillSettelApplyService.recallCreditInfo(query); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("终止") |
|||
@PutMapping("/stopCreditInfo") |
|||
@ResponseBody |
|||
ResultBean stopCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){ |
|||
return asBillSettelApplyService.stopCreditInfo(query); |
|||
} |
|||
|
|||
|
|||
@ApiOperation("获取流程操作标题") |
|||
@GetMapping("/getFlowOperateTitle") |
|||
@ResponseBody |
|||
ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap SettleFlowableQuery query){ |
|||
return asBillSettelApplyService.getFlowOperateTitle(query); |
|||
} |
|||
|
|||
|
|||
@ApiOperation(value = "加签") |
|||
@PutMapping(value = "/delegate") |
|||
@ResponseBody |
|||
public ResultBean delegate(@RequestBody AppSettleDelegateQuery delegateQuery){ |
|||
return asBillSettelApplyService.delegate2(delegateQuery); |
|||
} |
|||
|
|||
|
|||
} |
File diff suppressed because it is too large
@ -0,0 +1,46 @@ |
|||
package com.yxt.anrui.as.feign.portal.sysstafforg; |
|||
|
|||
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_portal(门户建设) <br/> |
|||
* File: SysStaffOrg.java <br/> |
|||
* Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg <br/> |
|||
* Description: 员工部门关联表. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2021-08-03 00:24:29 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@ApiModel(value = "员工部门关联表", description = "员工部门关联表") |
|||
@TableName("sys_staff_org") |
|||
@Data |
|||
public class SysStaffOrg extends BaseEntity { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
|
|||
@ApiModelProperty("部门sid") |
|||
private String orgSid; |
|||
|
|||
@ApiModelProperty("部门名称") |
|||
private String orgName; |
|||
|
|||
@ApiModelProperty("人员sid") |
|||
private String staffSid; |
|||
|
|||
@ApiModelProperty("部门路径") |
|||
private String orgSidPath; |
|||
|
|||
@ApiModelProperty("部门名称路径") |
|||
private String orgNamePath; |
|||
|
|||
@ApiModelProperty("管理类型:1、主管。2、分管。3、员工") |
|||
private String manageType; |
|||
} |
@ -0,0 +1,72 @@ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/3/19 15:18 |
|||
*/ |
|||
@Data |
|||
public class SalesGoodsVo { |
|||
@ApiModelProperty("商品Sku名称") |
|||
private String goodsSkuTitle; // 商品Sku名称
|
|||
private String sid; |
|||
//商品sid
|
|||
private String goodSpuSid; |
|||
private String inventorySid; |
|||
private String goodsSkuSid; |
|||
//商品名称
|
|||
private String goodsSpuName; |
|||
//商品编码(图号)
|
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("计量单位") |
|||
private String unit; |
|||
@ApiModelProperty("出/退库数量") |
|||
private String count; |
|||
@ApiModelProperty("销售价(元)") |
|||
private String price; |
|||
//折扣(0-10,0免费,10不打折)
|
|||
private String discount; |
|||
//优惠金额(=销售价*(1-折扣*0.1))
|
|||
private String discountAmount; |
|||
//金额(销售价-优惠金额)
|
|||
private String amount; |
|||
@ApiModelProperty("备注") |
|||
private String remarks; |
|||
|
|||
@ApiModelProperty("库存数量") |
|||
private String currentCount; |
|||
@ApiModelProperty("厂家") |
|||
private String supplierName; |
|||
@ApiModelProperty("商品ID") |
|||
private String goodsID; // 商品ID
|
|||
|
|||
//规格型号
|
|||
private String goodsSkuOwnSpec; |
|||
//仓库Sid
|
|||
private String warehouseSid; |
|||
//仓库
|
|||
private String warehouseName; |
|||
//库区sid
|
|||
private String areaSid; |
|||
//库区
|
|||
private String areaName; |
|||
//库位sid
|
|||
private String warehouseRackSid; |
|||
//库位编码
|
|||
private String warehouseRackCode; |
|||
//供应商sid
|
|||
private String billObjSid; |
|||
//供应商
|
|||
private String billObjName; |
|||
//销售价常量
|
|||
private String goodsDetailsPrice; |
|||
//是否含税(0含税,1不含税)
|
|||
private String isTaxRate; |
|||
@ApiModelProperty("厂家sid") |
|||
private String manufacturerSid; // 库位sid
|
|||
@ApiModelProperty("厂家名称") |
|||
private String manufacturerName; // 库位编号
|
|||
} |
@ -0,0 +1,30 @@ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/3/19 15:14 |
|||
*/ |
|||
@Data |
|||
public class SalesInvoiceVo { |
|||
|
|||
@ApiModelProperty("是否需要开发票(是1,否0)") |
|||
private String isInvoicing; // 是否需要开发票(是1,否0)
|
|||
@ApiModelProperty("发票类型") |
|||
private String invoiceType; // 发票类型
|
|||
private String invoiceTypeKey; // 发票类型Key
|
|||
@ApiModelProperty("开票名称") |
|||
private String invoiceTitle; // 开票名称
|
|||
@ApiModelProperty("税号") |
|||
private String taxpayerNo; // 税号
|
|||
@ApiModelProperty("发票号码") |
|||
private String invoiceCode; // 发票号码
|
|||
@ApiModelProperty("税率") |
|||
private String taxRate; // 税率
|
|||
@ApiModelProperty("开票单位sid") |
|||
private String invoiceTitleSid; // 开票单位sid
|
|||
|
|||
} |
@ -0,0 +1,37 @@ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/3/20 15:42 |
|||
*/ |
|||
@Data |
|||
public class SettlementVo { |
|||
@ApiModelProperty("付款人编号") |
|||
private String payerNo; // 付款人编号
|
|||
@ApiModelProperty("付款人名称") |
|||
private String payerName; // 付款人名称
|
|||
@ApiModelProperty("应收金额") |
|||
private String receivableAmount; // 应收金额
|
|||
@ApiModelProperty("订金抵扣") |
|||
private String depositdeductAmount; // 订金抵扣
|
|||
@ApiModelProperty("结算方式key") |
|||
private String settleKey; // 结算方式key
|
|||
@ApiModelProperty("结算方式value") |
|||
private String settleValue; // 结算方式value
|
|||
@ApiModelProperty("结算金额") |
|||
private String settleAmount; // 结算金额
|
|||
@ApiModelProperty("其他结算方式") |
|||
private String otherSettleKey; // 其他结算方式
|
|||
@ApiModelProperty("其他结算方式") |
|||
private String otherSettleValue; // 其他结算方式
|
|||
@ApiModelProperty("其他结算金额") |
|||
private String otherSettleAmount; // 其他结算金额
|
|||
@ApiModelProperty("欠款金额") |
|||
private String debts; // 欠款金额
|
|||
@ApiModelProperty("结算时间") |
|||
private String settleTime; // 结算时间
|
|||
} |
@ -0,0 +1,24 @@ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/6/20 11:09 |
|||
*/ |
|||
@Data |
|||
public class SmsAttachitemVo { |
|||
@ApiModelProperty("附加项目sid") |
|||
private String aitemsid; |
|||
@ApiModelProperty("附加项目名称") |
|||
private String aitemName; |
|||
@ApiModelProperty("销售价") |
|||
private String price; |
|||
@ApiModelProperty("备注") |
|||
private String remarks; |
|||
@ApiModelProperty("销售价常量") |
|||
private String aitemPrice; |
|||
|
|||
} |
@ -0,0 +1,119 @@ |
|||
/********************************************************* |
|||
********************************************************* |
|||
******************** ******************* |
|||
************* ************ |
|||
******* _oo0oo_ ******* |
|||
*** o8888888o *** |
|||
* 88" . "88 * |
|||
* (| -_- |) * |
|||
* 0\ = /0 * |
|||
* ___/`---'\___ * |
|||
* .' \\| |// '. *
|
|||
* / \\||| : |||// \ *
|
|||
* / _||||| -:- |||||- \ * |
|||
* | | \\\ - /// | | *
|
|||
* | \_| ''\---/'' |_/ | * |
|||
* \ .-\__ '-' ___/-. / * |
|||
* ___'. .' /--.--\ `. .'___ * |
|||
* ."" '< `.___\_<|>_/___.' >' "". * |
|||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | * |
|||
* \ \ `_. \_ __\ /__ _/ .-` / / * |
|||
* =====`-.____`.___ \_____/___.-`___.-'===== * |
|||
* `=---=' * |
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|||
*********************************************************/ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* Project: sms(sms) <br/> |
|||
* File: SmsSalesBillVo.java <br/> |
|||
* Class: com.yxt.sms.api.smssalesbill.SmsSalesBillVo <br/> |
|||
* Description: 销售单 视图数据对象. <br/> |
|||
* Copyright: Copyright (c) 2011 <br/> |
|||
* Company: https://gitee.com/liuzp315 <br/>
|
|||
* Makedate: 2024-03-15 17:24:44 <br/> |
|||
* |
|||
* @author liupopo |
|||
* @version 1.0 |
|||
* @since 1.0 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "销售单 视图数据详情", description = "销售单 视图数据详情") |
|||
public class SmsSalesBillDetailsVo implements Vo { |
|||
|
|||
private String sid; // sid
|
|||
private String createTime; |
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; // 制单人姓名
|
|||
@ApiModelProperty("制单部门sid") |
|||
private String deptSid; // 制单部门sid
|
|||
@ApiModelProperty("制单部门") |
|||
private String deptName; // 制单部门
|
|||
@ApiModelProperty("创建者") |
|||
private String createBySid; |
|||
@ApiModelProperty("客户sid") |
|||
private String customerSid; // 客户sid
|
|||
@ApiModelProperty("客户名称") |
|||
private String customerName; // 客户名称
|
|||
@ApiModelProperty("联系电话") |
|||
private String mobile; // 联系电话
|
|||
@ApiModelProperty("车牌号") |
|||
private String vehMark; // 车牌号
|
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; // 单据编号
|
|||
@ApiModelProperty("科目sid") |
|||
private String subjectSid; // 科目sid
|
|||
@ApiModelProperty("科目") |
|||
private String subject; // 科目
|
|||
@ApiModelProperty("销售用户sid单选)(销售用户sid)") |
|||
private String salesUserSid; // 销售用户sid单选)(销售用户sid)
|
|||
@ApiModelProperty("销售姓名") |
|||
private String salesName; // 销售姓名
|
|||
@ApiModelProperty("条形码") |
|||
private String barCode; // 条形码
|
|||
@ApiModelProperty("快捷备注(选择)") |
|||
private String shotRemarks; // 快捷备注(选择)
|
|||
@ApiModelProperty("备注(打印)") |
|||
private String printRemarks; // 备注(打印)
|
|||
@ApiModelProperty("整体优惠金额") |
|||
private String discountAmount; // 整体优惠金额
|
|||
@ApiModelProperty("整体优惠券") |
|||
private String coupon; // 整体优惠券
|
|||
@ApiModelProperty("积分抵扣") |
|||
private String scoreDeduct; // 积分抵扣
|
|||
private SalesInvoiceVo invoiceVo = new SalesInvoiceVo(); //发票信息
|
|||
private List<SalesGoodsVo> goodsVos = new ArrayList<>(); //商品信息
|
|||
private SettlementVo settlementVo = new SettlementVo(); //结算信息
|
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; // 使用组织sid
|
|||
@ApiModelProperty("创建组织sid") |
|||
private String createOrgSid; // 创建组织sid
|
|||
|
|||
|
|||
@ApiModelProperty("车架号") |
|||
private String vinNo; // 车架号
|
|||
@ApiModelProperty("备注") |
|||
private String remarks; // 车架号
|
|||
@ApiModelProperty("客户单位") |
|||
private String customerOrg; // 客户单位
|
|||
@ApiModelProperty("应收金额") |
|||
private String receivableAmount; |
|||
@ApiModelProperty("材料费") |
|||
private String goodsAmount; |
|||
@ApiModelProperty("附加费") |
|||
private String addAmount; |
|||
private List<SmsAttachitemVo> aitemVos = new ArrayList<>();// 附加项目
|
|||
|
|||
|
|||
|
|||
} |
@ -0,0 +1,28 @@ |
|||
package com.yxt.anrui.as.feign.sms.smssalesbill; |
|||
|
|||
import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerFeignFallback; |
|||
import com.yxt.anrui.as.feign.sms.SmsGoods; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.GetMapping; |
|||
import org.springframework.web.bind.annotation.PathVariable; |
|||
import org.springframework.web.bind.annotation.RequestParam; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/28 13:40 |
|||
*/ |
|||
@FeignClient( |
|||
contextId = "yxt-sms-SmsSalesBill", |
|||
name = "yxt-sms", |
|||
path = "apiadmin/v1/smssalesbill", |
|||
fallback = BaseManufacturerFeignFallback.class |
|||
) |
|||
public interface SmsSalesBillFeign { |
|||
|
|||
@ApiOperation("根据SID获取一条记录") |
|||
@GetMapping("/fetchDetailsBySid/{sid}") |
|||
public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid); |
|||
} |
Loading…
Reference in new issue