From ddcde9e1da5b440f163bfea5220fb72ef7ec8d1b Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Sat, 28 Feb 2026 16:27:07 +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一致性检查逻辑
- 验证发货数据仓库与出库单仓库是否匹配
- 不一致时抛出服务异常并提示用户重新确认
- 恢复票据类型选择框功能而非只读标签显示
---
 .../receipt/components/ReceiptDialog.vue       | 18 +++++++++---------
 .../impl/InventoryDeliveryServiceImpl.java     |  4 ++++
 2 files changed, 13 insertions(+), 9 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 281d8553..0e524b92 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
@@ -114,15 +114,15 @@
         <el-col :span="12">
           <el-form :model="uploadForm" ref="uploadForm" :rules="rules" label-width="120px" size="medium" >
             <el-form-item label="票据类型" prop="ticketType" required>
-              <dict-tag :options="dict.type.finance_invoice_type" :value="uploadForm.ticketType"/>
-<!--              <el-select v-model="uploadForm.ticketType" placeholder="请选择票据类型">-->
-<!--                <el-option-->
-<!--                  v-for="item in dict.type.finance_invoice_type"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--                  :value="item.value"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
+<!--              <dict-tag :options="dict.type.finance_invoice_type" :value="uploadForm.ticketType"/>-->
+              <el-select v-model="uploadForm.ticketType" placeholder="请选择票据类型">
+                <el-option
+                  v-for="item in dict.type.finance_invoice_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="收票附件" prop="file" required>
               <div style="display: flex; flex-direction: column; align-items: flex-start;">
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index 11d673bd..9009c435 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -134,6 +134,10 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
             }).collect(Collectors.toList());
             inventoryInfoService.saveBatch(inventoryInfoList);
         } else {
+            Long warehouseId = productSnDataList.get(0).getWarehouseId();
+            if (warehouseId!=null && !warehouseId.equals(inventoryDelivery.getWarehouseId())){
+                throw new ServiceException("发货数据仓库与出库单仓库不一致,请确认后重试");
+            }
             for (InventoryInfo inventoryInfo : productSnDataList) {
                 inventoryInfo.setInventoryStatus(InventoryInfo.InventoryStatusEnum.OUTER.getCode());
                 inventoryInfo.setOuterCode(inventoryDelivery.getOuterCode());