From 115394106a498dc39c72df71ffe1455eb70fb03e Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 4 Mar 2026 19:08:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(inventory):=20=E8=A7=A3=E5=86=B3=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加仓库ID一致性检查逻辑 - 验证发货数据仓库与出库单仓库是否匹配 - 不一致时抛出服务异常并提示用户重新确认 - 恢复票据类型选择框功能而非只读标签显示 --- .../src/views/finance/receipt/components/ReceiptDialog.vue | 2 +- .../resources/mapper/sip/OmsPayableTicketDetailMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue index 0e524b92..6da6f7e6 100644 --- a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue +++ b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue @@ -20,7 +20,7 @@
票据类型 - +
{{ titleText }} diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPayableTicketDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPayableTicketDetailMapper.xml index 40d85993..919fac69 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPayableTicketDetailMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPayableTicketDetailMapper.xml @@ -95,8 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from (SELECT sum(payment_amount) payment_amount, payable_bill_id FROM oms_payable_ticket_detail t1 - left join oms_ticket_write_off t2 on t1.write_off_id=t2.id - WHERE (t1.write_off_id is null or t1.payment_bill_code=t2.payment_bill_code) and ticket_bill_code in + left join oms_payable_ticket_write_off t2 on t1.write_off_id=t2.id + WHERE (t1.write_off_id is null or t1.ticket_bill_code=t2.ticket_bill_code) and t1.ticket_bill_code in #{item}