fix(bms):科目编码重复致新增账单失败,税率查询按编码+名称取唯一;复制账单改生成新计费流水
- getTaxRate 增加 SUBJECT_NAME 匹配,费用科目编码重复(如1003同时有运输处理费/报关费3)时不再抛 TooManyResultsException,查不到税率兜底0 - addBill、开票/NC推送共4处调用点同步调整;计费流水号为空时只处理自身明细,防空指针 - copyBill 明细清空计费流水id并按原流水映射生成新JFLS流水号,防止复制提交后把原账单的流水改挂到新账单(原账单明细丢失) - insertAndReturnId 币种空值兜底CNY(与addCost对齐)
This commit is contained in:
@@ -49,7 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
AND bill_manage_id = #{billManageId} GROUP BY INVOICE_ITEM,INVOICE_ITEM_NAME,FEE_TYPE
|
||||
</select>
|
||||
|
||||
<select id="getTaxRate" resultType="java.lang.Double" parameterType="java.lang.String">
|
||||
<!-- 科目编码存在重复(主数据未做唯一校验,如1003同时有"运输处理费/报关费3"),按编码+名称取唯一一条 -->
|
||||
<select id="getTaxRate" resultType="java.lang.Double">
|
||||
SELECT
|
||||
rate
|
||||
FROM
|
||||
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
WHERE
|
||||
del_flag = 1
|
||||
AND SUBJECT_CODE = #{code}
|
||||
AND SUBJECT_NAME = #{name}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user