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 2024-08-14 10:41:34 +08:00
parent 4660102664
commit 162e62795e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
View File

@ -118,9 +118,11 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
} }
if(emisSettleInvoiceRecord.getApplyMoney().compareTo(totalFee)>0){ if(emisSettleInvoiceRecord.getApplyMoney().compareTo(totalFee)>0){
throw new EmisBizError(EmisBizErrorType.FAIL,"开票金额不可大于总账单金额"); // throw new EmisBizError(EmisBizErrorType.FAIL,"开票金额不可大于总账单金额");
} }
emisSettleInvoiceRecord.setOpenMoneyMax(totalFee);
// id流水号 // id流水号
String applySeqNo= WaybillHelper.genApplySeqNo(); String applySeqNo= WaybillHelper.genApplySeqNo();
emisSettleInvoiceRecord.setApplySeqNo(applySeqNo); emisSettleInvoiceRecord.setApplySeqNo(applySeqNo);
@ -160,7 +162,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
newBill.setId(oldBill.getId()); newBill.setId(oldBill.getId());
newBill.setOpenBillStatus("1"); newBill.setOpenBillStatus("1");
// 更新账单收款状态 // 更新账单开票状态
emisSettleBillMapper.updateEmisSettleBill(newBill); emisSettleBillMapper.updateEmisSettleBill(newBill);
// 更新子账单的收款状态 // 更新子账单的收款状态
@ -174,6 +176,8 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
// } // }
// } // }
return 1; return 1;
} }

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

@ -104,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''"> <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and create_time <![CDATA[ >= ]]> #{params.beginCreateTime} and create_time <![CDATA[ >= ]]> #{params.beginCreateTime}
</if> </if>
@ -111,6 +112,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and create_time <![CDATA[ <= ]]> #{params.endCreateTime} and create_time <![CDATA[ <= ]]> #{params.endCreateTime}
</if> </if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and settle_bill_no in(
select bill_no from emis_settle_sub_bill b
where del_flag='0'
and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
)
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and settle_bill_no in( and settle_bill_no in(