diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 2ab3a135d..602c00ddd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -122,6 +122,10 @@ public class EmisSettleBillController extends BaseController return getDataTable(list); } + + + + /** * 开票统计 * @param emisSettleBill diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java index 88f476fb4..6b0a0dab6 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java @@ -13,10 +13,12 @@ package com.xdadan.erp.web.emis; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSONObject; +import com.xdadan.erp.emis.domain.EmisSettleBill; import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.utils.WaybillHelper; @@ -89,6 +91,17 @@ public class EmisSettlePayRecordController extends BaseController return getDataTable(list); } + @GetMapping("/queryPayBackRecordList") + public TableDataInfo queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) + { + startPage(); + + setPrivParams(emisSettlePayRecord); + + List list = emisSettlePayRecordService.queryPayBackRecordList(emisSettlePayRecord); + return getDataTable(list); + } + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java new file mode 100644 index 000000000..4e0cff3d9 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java @@ -0,0 +1,30 @@ +package com.xdadan.erp.emis.domain.stat; + +import com.xdadan.erp.emis.domain.EmisSettleBill; +import com.xdadan.erp.emis.domain.EmisSettlePayRecord; +import com.xdadan.erp.emis.domain.EmisWaybill; +import lombok.Data; + +import java.io.Serializable; + +/** + * 收款统计明细 + * 账单名称 账单月份 账期 运单号 客户名称 支付方式 付款方式 开票状态 开票金额 收款状态 账单金额 账单退款金额 理赔金额 折让金额 抵扣金额 其他收费 收款金额 收款时间 收款登记人 销售联系人 回款联系人 寄件公司 件数 重量 实际重量 体积 结算重量 线路 产品类型 收款登记备注 + */ +@Data +public class PayBackRecordDtl implements Serializable { + private static final long serialVersionUID = 1L; + +// 账单名称 账单月份 账期 运单号 客户名称 支付方式 付款方式 开票状态 开票金额 收款状态 账单金额 账单退款金额 理赔金额 折让金额 抵扣金额 其他收费 收款金额 收款时间 收款登记人 销售联系人 回款联系人 寄件公司 件数 重量 实际重量 体积 结算重量 线路 产品类型 收款登记备注 + // 运单号 + private String billCode; + private String payId; + private String settleBillNo; + + // 运单详情 + private EmisWaybill waybillDetail; + private EmisSettleBill settleBillDetail; + private EmisSettlePayRecord settlePayRecordDetail; + + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java index b75f7f58d..74f9b692f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisSettlePayRecord; /** @@ -39,6 +41,7 @@ public interface EmisSettlePayRecordMapper extends BaseMapper selectSettlePayRecordListBySettleBillNo(String settleBillNo); + public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord); /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java index db9f30381..013f34f69 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java @@ -10,6 +10,9 @@ package com.xdadan.erp.emis.service; import java.util.List; +import java.util.Map; + +import com.xdadan.erp.emis.domain.EmisSettleBill; import com.xdadan.erp.emis.domain.EmisSettlePayRecord; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -36,6 +39,7 @@ public interface IEmisSettlePayRecordService */ public List selectEmisSettlePayRecordList(EmisSettlePayRecord emisSettlePayRecord); + public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord); /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index 0a7349699..4a65972d7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -91,6 +91,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return emisSettlePayRecordMapper.selectEmisSettlePayRecordList(emisSettlePayRecord); } + @Override + public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) + { + return emisSettlePayRecordMapper.queryPayBackRecordList(emisSettlePayRecord); + } + /** * 检查是否重复 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml index 12686d564..d4131f165 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml @@ -47,6 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + select id, pay_id, pay_type, rec_type, pay_man, pay_man_code, settle_bill_no, bl_audit, audit_date, audit_man_code, audit_site_code, customer_code, customer_name, pay_money, pay_status, pay_status_desc, break_type, break_reason, break_emp_code, rec_man_code, settle_type, refund_date, refund_man_code, refund_seq, refund_mode, refund_money, refund_reason, refund_remark, refund_op_man_code, refund_register_site_code, refund_register_man_code, satisfy_money, satisfy_reason, allowance_money, allowance_reason, deduction_money, deduction_reason, other_money, other_reason, trade_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_pay_record @@ -150,6 +176,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag='0' and a.settle_bill_no = #{settleBillNo} + + + @@ -212,6 +264,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from emis_settle_pay_record a where a.id = #{id} + + insert into emis_settle_pay_record