aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-06 08:00:20 +08:00
parent 9151b2cdd2
commit d793366317
7 changed files with 118 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -122,6 +122,10 @@ public class EmisSettleBillController extends BaseController
return getDataTable(list);
}
/**
* 开票统计
* @param emisSettleBill

13
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
View File

@ -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<Map> list = emisSettlePayRecordService.queryPayBackRecordList(emisSettlePayRecord);
return getDataTable(list);
}
/**
* 检查是否重复

30
emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java Normal file
View File

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

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java
View File

@ -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<EmisSettlePayRecor
public List<EmisSettlePayRecord> selectSettlePayRecordListBySettleBillNo(String settleBillNo);
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
/**
* 检查是否重复

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java
View File

@ -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<EmisSettlePayRecord> selectEmisSettlePayRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
/**
* 检查是否重复

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -91,6 +91,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
return emisSettlePayRecordMapper.selectEmisSettlePayRecordList(emisSettlePayRecord);
}
@Override
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord)
{
return emisSettlePayRecordMapper.queryPayBackRecordList(emisSettlePayRecord);
}
/**
* 检查是否重复
*

58
emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
View File

@ -47,6 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="tradeDate" column="trade_date" />
</resultMap>
<resultMap type="PayBackRecordDtl" id="PayBackRecordDtlResult">
<result property="billCode" column="bill_code" />
<result property="payId" column="pay_id" />
<result property="settleBillNo" column="settle_bill_no" />
<association property="waybillDetail"
column="bill_code"
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
fetchType="lazy"
/>
<association property="settleBillDetail"
column="settle_bill_no"
select="com.xdadan.erp.emis.mapper.EmisSettleBillMapper.selectSettleBillBySettleBillNo"
fetchType="lazy"
/>
<association property="settlePayRecordDetail"
column="pay_id"
select="selectEmisSettlePayRecordByPayId"
fetchType="lazy"
/>
</resultMap>
<sql id="selectEmisSettlePayRecordVo">
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
</sql>
@ -150,6 +176,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag='0' and a.settle_bill_no = #{settleBillNo}
</select>
<select id="queryPayBackRecordList" parameterType="EmisSettlePayRecord" resultMap="PayBackRecordDtlResult">
SELECT
a0.settle_bill_no,
a1.bill_code,
b.pay_id,
b.create_time
FROM
emis_settle_bill a0,
emis_settle_sub_bill a1,
emis_settle_pay_record b,
emis_settle_pay_bill_rel c,
emis_settle_pay_rel d
WHERE
a0.del_flag = '0'
and a1.del_flag = '0'
AND b.del_flag = '0'
AND c.del_flag = '0'
AND a0.settle_bill_no = c.settle_bill_no
AND a0.settle_bill_no = a1.settle_bill_no
AND b.pay_id = c.pay_id
and b.pay_id=d.pay_id
and a1.settle_bill_no = #{settleBillNo}
order by b.create_time desc
</select>
@ -212,6 +264,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from emis_settle_pay_record a
where a.id = #{id}
</select>
<select id="selectEmisSettlePayRecordByPayId" parameterType="Long" resultMap="EmisSettlePayRecordResult">
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 a
where a.pay_id = #{payId} and a.del_flag='0'
</select>
<insert id="insertEmisSettlePayRecord" parameterType="EmisSettlePayRecord" useGeneratedKeys="true" keyProperty="id">
insert into emis_settle_pay_record