From a30a214ac0ff6a0cc496686a9ebb65a051c527aa Mon Sep 17 00:00:00 2001 From: wjh Date: Wed, 24 Apr 2024 11:26:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AD=9B=E9=80=89=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E7=B1=BB=E5=9E=8B=20(#829)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/829 Co-authored-by: wjh Co-committed-by: wjh --- .changeset/rare-steaks-bathe.md | 5 +++++ .../@hera/plugin-rental/src/server/sqls/settlement_calc.sql | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/rare-steaks-bathe.md diff --git a/.changeset/rare-steaks-bathe.md b/.changeset/rare-steaks-bathe.md new file mode 100644 index 000000000..8aee9bdf2 --- /dev/null +++ b/.changeset/rare-steaks-bathe.md @@ -0,0 +1,5 @@ +--- +"@hera/plugin-rental": minor +--- + +出库单改成了直发单,但是订单绑定的合同还在,结算单是根据合同查找,做了类型排除 diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql index b7659fdaf..201d44314 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql @@ -247,6 +247,7 @@ SELECT records r WHERE r.contract_id = COALESCE(main.id, c.id) + AND r.category = '0' AND (s.end_date + INTERVAL '1 day - 1 millisecond') >= r.date ) AS records, (