应付模块菜单调整,新增应付费用编辑等

This commit is contained in:
liuminghui
2026-11-16 15:50:51 +08:00
parent 5b8d4de262
commit 49f24a6b1b
66 changed files with 3247 additions and 119 deletions
@@ -19,35 +19,91 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="sourceId" column="source_id" />
<result property="isDeleted" column="is_deleted" />
<result property="statementLineId" column="statement_line_id" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="feeItemName">
case
when f.fee_source = 'MANUAL' and nullif(trim(f.fee_name), '') is not null then f.fee_name
when f.fee_source = 'LADING' and nullif(trim(air_sc.sc_name), '') is not null then air_sc.sc_name
when f.fee_type = 'SURCHARGE' and nullif(trim(item_sc.sc_name), '') is not null then item_sc.sc_name
when nullif(trim(f.fee_name), '') is not null then f.fee_name
when nullif(trim(dict.dict_label), '') is not null then dict.dict_label
else f.fee_type
end
</sql>
<sql id="feeItemJoin">
left join srv_bill_air_fee air on f.fee_source = 'LADING' and air.id = f.sc_id
left join prc_surcharge air_sc on air_sc.sc_id = air.sc_id
left join prc_surcharge item_sc on ifnull(f.fee_source, '') &lt;&gt; 'LADING' and item_sc.sc_id = f.sc_id
left join sys_dict_data dict on dict.dict_type = 'bms_fee_type' and dict.dict_value = f.fee_type
</sql>
<select id="selectByBillId" parameterType="Long" resultMap="PrcPayBillFeeResult">
select fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
fee_source, source_id, is_deleted, create_time
from prc_pay_bill_fee
where bill_id = #{billId}
and is_deleted = '0'
order by field(fee_type, 'BASIC_FREIGHT', 'REGISTRATION_FEE', 'SURCHARGE', 'REFUND'), fee_id
select f.fee_id, f.bill_id, f.pay_bill_id, f.fee_type, <include refid="feeItemName"/> as fee_name,
f.sc_id, f.fee_level, f.amount, f.currency, f.round_mode, f.remark,
f.fee_source, f.source_id, f.is_deleted, f.statement_line_id,
f.create_by, f.create_time, f.update_by, f.update_time
from prc_pay_bill_fee f
<include refid="feeItemJoin"/>
where f.bill_id = #{billId}
and f.is_deleted = '0'
order by field(f.fee_type, 'BASIC_FREIGHT', 'REGISTRATION_FEE', 'SURCHARGE', 'REFUND', 'ADJUST'), f.fee_id
</select>
<select id="selectByFeeId" resultMap="PrcPayBillFeeResult">
select f.fee_id, f.bill_id, f.pay_bill_id, f.fee_type, <include refid="feeItemName"/> as fee_name,
f.sc_id, f.fee_level, f.amount, f.currency, f.round_mode, f.remark,
f.fee_source, f.source_id, f.is_deleted, f.statement_line_id,
f.create_by, f.create_time, f.update_by, f.update_time
from prc_pay_bill_fee f
<include refid="feeItemJoin"/>
where f.fee_id = #{feeId}
limit 1
</select>
<insert id="insertManual" parameterType="PrcPayBillFee">
insert into prc_pay_bill_fee (
fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, remark,
fee_source, is_deleted, create_by, create_time, update_by, update_time
) values (
#{feeId}, #{billId}, #{payBillId}, #{feeType}, #{feeName}, #{scId}, #{feeLevel}, #{amount}, #{currency}, #{remark},
'MANUAL', '0', #{createBy}, sysdate(), #{updateBy}, sysdate()
)
</insert>
<update id="markFeeDeleted">
update prc_pay_bill_fee
set is_deleted = '1',
update_by = #{operator},
update_time = sysdate()
where fee_id = #{feeId}
and ifnull(is_deleted, '0') = '0'
and statement_line_id is null
</update>
<insert id="insertPrcPayBillFee" parameterType="PrcPayBillFee">
insert into prc_pay_bill_fee (
fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
fee_id, bill_id, pay_bill_id, fee_type, sc_id, fee_level, amount, currency, round_mode, remark,
fee_source, source_id, is_deleted, create_time
) values (
#{feeId}, #{billId}, #{payBillId}, #{feeType}, #{feeName}, #{scId}, #{feeLevel}, #{amount}, #{currency}, #{roundMode}, #{remark},
#{feeId}, #{billId}, #{payBillId}, #{feeType}, #{scId}, #{feeLevel}, #{amount}, #{currency}, #{roundMode}, #{remark},
ifnull(#{feeSource}, 'CALC'), #{sourceId}, ifnull(#{isDeleted}, '0'), sysdate()
)
</insert>
<insert id="insertBatch" parameterType="java.util.List">
insert into prc_pay_bill_fee (
fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
fee_id, bill_id, pay_bill_id, fee_type, sc_id, fee_level, amount, currency, round_mode, remark,
fee_source, source_id, is_deleted, create_time
) values
<foreach collection="list" item="item" separator=",">
(#{item.feeId}, #{item.billId}, #{item.payBillId}, #{item.feeType}, #{item.feeName}, #{item.scId}, #{item.feeLevel},
(#{item.feeId}, #{item.billId}, #{item.payBillId}, #{item.feeType}, #{item.scId}, #{item.feeLevel},
#{item.amount}, #{item.currency}, #{item.roundMode}, #{item.remark}, ifnull(#{item.feeSource}, 'CALC'),
#{item.sourceId}, ifnull(#{item.isDeleted}, '0'), sysdate())
</foreach>
@@ -83,6 +139,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and bill_id is not null
</select>
<select id="selectAliveByLadingFee" resultMap="PrcPayBillFeeResult">
select f.fee_id, f.bill_id, f.pay_bill_id, f.fee_type, <include refid="feeItemName"/> as fee_name,
f.sc_id, f.fee_level, f.amount, f.currency, f.round_mode, f.remark,
f.fee_source, f.source_id, f.is_deleted, f.statement_line_id,
f.create_by, f.create_time, f.update_by, f.update_time
from prc_pay_bill_fee f
<include refid="feeItemJoin"/>
where f.fee_source = 'LADING'
and f.sc_id = #{feeId}
and ifnull(f.is_deleted, '0') = '0'
</select>
<update id="markLadingFeeDeleted">
update prc_pay_bill_fee
set is_deleted = '1'
@@ -91,13 +159,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and ifnull(is_deleted, '0') = '0'
</update>
<update id="fillSourceIdByFeeIds">
update prc_pay_bill_fee
set source_id = fee_id
where (source_id is null or source_id = '')
and fee_id in
<foreach collection="feeIds" item="feeId" open="(" separator="," close=")">#{feeId}</foreach>
</update>
<select id="countSettledCalc" resultType="int">
select count(1)
from prc_pay_bill_fee
where bill_id = #{billId}
and ifnull(is_deleted, '0') = '0'
and (fee_source is null or fee_source = '' or fee_source = 'CALC')
and statement_line_id is not null
</select>
<delete id="deleteByBillId" parameterType="Long">
delete from prc_pay_bill_fee