From b12d4496c3dbd2c76dab8029cfb7d56c0f6d38a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 8 Sep 2021 22:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B7=B2=E7=BB=8F=E6=94=B6=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=AE=8C=E6=88=90=E7=9A=84=E5=8D=95=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper_xml/DepotHeadMapperEx.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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