diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 332e6ca6..92006f9d 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -582,7 +582,8 @@ ) - and abs(dh.change_amount) < dh.discount_last_money + and (abs(dh.change_amount)+(select ifnull(sum(ai.each_amount),0) from jsh_account_item ai where ai.bill_id=dh.id and ifnull(ai.delete_flag,'0') !='1')) + < (dh.discount_last_money + dh.other_money) and ifnull(dh.delete_flag,'0') !='1' order by dh.id desc