From 6c3ca47fb71964314f30db70a9bf98d37891a271 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Thu, 30 Apr 2026 01:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=9C=B0=E5=9D=80=EF=BC=9A?=
 =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=90=8C=E5=93=81=E7=89=8C=E6=9C=BA=E5=BA=8A=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8=E3=80=81=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AFDelete=E6=8A=9B=E5=BC=82=E5=B8=B8=E3=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=85=81=E8=AE=B8NULL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/collect-address/CollectAddressListPage.vue | 2 +-
 src/CncService/Impl/CollectAddressService.cs                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/collect-address/CollectAddressListPage.vue b/frontend/src/views/collect-address/CollectAddressListPage.vue
index 9909dcc..3a00d00 100644
--- a/frontend/src/views/collect-address/CollectAddressListPage.vue
+++ b/frontend/src/views/collect-address/CollectAddressListPage.vue
@@ -17,7 +17,7 @@
       <el-table-column label="操作" width="120" align="center"><template #default="{row}">
         <div style="white-space:nowrap">
           <el-button link type="primary" @click="handleEdit(row)">编辑</el-button>
-          <el-button link type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button link type="danger" :disabled="row.machineCount>0" @click="handleDelete(row)">删除</el-button>
         </div>
       </template></el-table-column>
     </el-table>
diff --git a/src/CncService/Impl/CollectAddressService.cs b/src/CncService/Impl/CollectAddressService.cs
index 47d61d7..8528a30 100644
--- a/src/CncService/Impl/CollectAddressService.cs
+++ b/src/CncService/Impl/CollectAddressService.cs
@@ -120,7 +120,8 @@ namespace CncService.Impl
         public bool Delete(int id)
         {
             // 检查关联机床数量
-            if (_collectAddressRepository.GetMachineCount(id) > 0) return false;
+            var count = _collectAddressRepository.GetMachineCount(id);
+            if (count > 0) throw new BusinessException(CncModels.Constants.ErrorCode.DataReferenced, $"该地址下有 {count} 台机床，请先解除关联");
             return _collectAddressRepository.Delete(id);
         }