From 8010823b016b6441b31a2e8dfd19034e951ede3c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:11:52 +0800
Subject: [PATCH] feat(mes): 添加盘号字段并优化权限控制

---
 src/views/infra/apiErrorLog/index.vue                         |    1 
 src/api/mes/wm/batch/index.ts                                 |    1 
 src/views/im/manager/message/group/index.vue                  |    1 
 src/views/wls/transfer/data.ts                                |    1 
 src/views/infra/job/logger/index.vue                          |    1 
 src/views/mes/dv/machinery/index.vue                          |    1 
 src/views/wls/materialstock/components/stock-adjust-modal.vue |   29 ++++++
 src/views/system/operatelog/index.vue                         |    1 
 src/views/mes/dv/metering/index.vue                           |    1 
 src/views/im/manager/message/private/index.vue                |    1 
 src/views/mes/pro/task/modules/schedule-form.vue              |    9 ++
 src/views/wls/returnsales/modules/form.vue                    |    7 +
 src/views/mes/dv/repair/index.vue                             |    1 
 src/views/erp/purchase/order/index.vue                        |    1 
 src/views/erp/purchase/invoice/index.vue                      |    1 
 src/api/mes/wm/returnsales/line/index.ts                      |    1 
 src/views/system/notify/message/index.vue                     |    1 
 src/views/dashboard/analytics/modules/biz-cards.vue           |   10 +-
 src/views/erp/finance/receipt/index.vue                       |    1 
 src/views/system/mail/log/index.vue                           |    1 
 src/api/mes/qc/rqc/index.ts                                   |    1 
 src/api/mes/wm/returnsales/detail/index.ts                    |    1 
 src/views/erp/sale/order/index.vue                            |    3 
 src/api/mes/wm/productsales/detail/index.ts                   |    1 
 src/views/erp/finance/voucher/index.vue                       |    1 
 src/views/erp/finance/payment/index.vue                       |    1 
 src/views/mes/dv/checkrecord/index.vue                        |    1 
 src/api/mes/wm/salesnotice/line/index.ts                      |    1 
 src/views/mes/pro/task/data.ts                                |   18 +++
 src/views/mes/qc/iqc/index.vue                                |    1 
 src/views/im/manager/group/index.vue                          |    1 
 src/views/bpm/form/index.vue                                  |    1 
 src/views/mes/pro/andon/record/index.vue                      |    1 
 src/views/bpm/oa/notice/index.vue                             |    1 
 src/views/infra/apiAccessLog/index.vue                        |    1 
 src/views/erp/purchase/request/index.vue                      |    1 
 src/views/mes/qc/rqc/index.vue                                |    1 
 src/views/system/social/user/index.vue                        |    1 
 src/views/mes/dv/meteringcheck/index.vue                      |    1 
 src/views/bpm/task/todo/index.vue                             |    1 
 src/views/mes/workbench/index.vue                             |    2 
 src/api/mes/wm/transfer/line/index.ts                         |    1 
 src/views/mes/dv/maintenrecord/index.vue                      |    1 
 src/views/im/manager/rtc/index.vue                            |    1 
 src/views/bpm/task/copy/index.vue                             |    1 
 src/views/system/loginlog/index.vue                           |    1 
 src/views/wls/batch/data.ts                                   |    9 ++
 src/views/wls/salesnotice/data.ts                             |    5 +
 src/views/system/sms/log/index.vue                            |    1 
 src/views/wls/returnsales/data.ts                             |   17 ++-
 src/views/wls/batch/components/select.vue                     |    1 
 src/views/mes/qc/ipqc/index.vue                               |    1 
 src/views/mes/qc/oqc/index.vue                                |    1 
 src/views/wls/barcode/index.vue                               |    1 
 src/views/wls/salesnotice/modules/line-form.vue               |   46 +++++++++-
 src/api/mes/wm/productsales/line/index.ts                     |    1 
 src/views/infra/job/index.vue                                 |    1 
 src/views/wls/returnsales/modules/line-form.vue               |   16 ----
 src/views/srm/supplierApply/index.vue                         |    1 
 src/views/wls/productsales/data.ts                            |   10 ++
 src/views/mes/qc/rqc/data.ts                                  |    1 
 61 files changed, 146 insertions(+), 83 deletions(-)

diff --git a/src/api/mes/qc/rqc/index.ts b/src/api/mes/qc/rqc/index.ts
index d2898e9..42deb47 100644
--- a/src/api/mes/qc/rqc/index.ts
+++ b/src/api/mes/qc/rqc/index.ts
@@ -22,6 +22,7 @@
     itemSpecification?: string; // 瑙勬牸鍨嬪彿锛堝叧鑱旀煡璇級
     unitName?: string; // 鍗曚綅鍚嶇О锛堝叧鑱旀煡璇級
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 閫�璐ф壒娆$洏鍙�
     checkQuantity?: number; // 妫�娴嬫暟閲�
     qualifiedQuantity?: number; // 鍚堟牸鍝佹暟閲�
     unqualifiedQuantity?: number; // 涓嶅悎鏍兼暟閲�
diff --git a/src/api/mes/wm/batch/index.ts b/src/api/mes/wm/batch/index.ts
index 3b5b70c..6fac15e 100644
--- a/src/api/mes/wm/batch/index.ts
+++ b/src/api/mes/wm/batch/index.ts
@@ -7,6 +7,7 @@
   export interface Batch {
     id?: number; // 鎵规 ID
     code?: string; // 鎵规缂栫爜
+    reelNo?: string; // 鐢熶骇杩芥函鐩樺彿
     itemId?: number; // 鐗╂枡 ID
     itemCode?: string; // 鐗╂枡缂栫爜
     itemName?: string; // 鐗╂枡鍚嶇О
diff --git a/src/api/mes/wm/productsales/detail/index.ts b/src/api/mes/wm/productsales/detail/index.ts
index 5aa0756..3ab094e 100644
--- a/src/api/mes/wm/productsales/detail/index.ts
+++ b/src/api/mes/wm/productsales/detail/index.ts
@@ -13,6 +13,7 @@
     materialStockId?: number; // 搴撳瓨璁板綍缂栧彿
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 瀹為檯鎷h揣搴撳瓨鐩樺彿
     warehouseId?: number; // 浠撳簱缂栧彿
     warehouseName?: string; // 浠撳簱鍚嶇О
     locationId?: number; // 搴撳尯缂栧彿
diff --git a/src/api/mes/wm/productsales/line/index.ts b/src/api/mes/wm/productsales/line/index.ts
index 1f8e46a..53f17b4 100644
--- a/src/api/mes/wm/productsales/line/index.ts
+++ b/src/api/mes/wm/productsales/line/index.ts
@@ -18,6 +18,7 @@
     pickedQuantity?: number; // 宸叉嫞璐ф暟閲�
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
     oqcCheckFlag?: boolean; // 鏄惁妫�楠�
     remark?: string; // 澶囨敞
   }
diff --git a/src/api/mes/wm/returnsales/detail/index.ts b/src/api/mes/wm/returnsales/detail/index.ts
index dfba83f..c86a462 100644
--- a/src/api/mes/wm/returnsales/detail/index.ts
+++ b/src/api/mes/wm/returnsales/detail/index.ts
@@ -10,6 +10,7 @@
     quantity?: number; // 鏁伴噺
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 涓婃灦鎵规鐩樺彿
     warehouseId?: number; // 浠撳簱缂栧彿
     warehouseName?: string; // 浠撳簱鍚嶇О
     locationId?: number; // 搴撳尯缂栧彿
diff --git a/src/api/mes/wm/returnsales/line/index.ts b/src/api/mes/wm/returnsales/line/index.ts
index f08ce77..640d48e 100644
--- a/src/api/mes/wm/returnsales/line/index.ts
+++ b/src/api/mes/wm/returnsales/line/index.ts
@@ -15,6 +15,7 @@
     quantity?: number; // 閫�璐ф暟閲�
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 閫�璐ф壒娆$洏鍙�
     rqcCheckFlag?: boolean; // 鏄惁闇�瑕佽川妫�
     rqcId?: number; // 閫�璐ф楠屽崟缂栧彿
     qualityStatus?: number; // 璐ㄩ噺鐘舵��
diff --git a/src/api/mes/wm/salesnotice/line/index.ts b/src/api/mes/wm/salesnotice/line/index.ts
index cb908e7..10426f9 100644
--- a/src/api/mes/wm/salesnotice/line/index.ts
+++ b/src/api/mes/wm/salesnotice/line/index.ts
@@ -15,6 +15,7 @@
     unitMeasureName?: string; // 鍗曚綅
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
     quantity?: number; // 鍙戣揣鏁伴噺
     outCount?: number; // 宸插嚭搴撴暟閲�
     oqcCheckFlag?: boolean; // 鏄惁妫�楠�
diff --git a/src/api/mes/wm/transfer/line/index.ts b/src/api/mes/wm/transfer/line/index.ts
index 9ec7b5e..1e167f9 100644
--- a/src/api/mes/wm/transfer/line/index.ts
+++ b/src/api/mes/wm/transfer/line/index.ts
@@ -14,6 +14,7 @@
     quantity?: number; // 杞Щ鏁伴噺
     batchId?: number; // 鎵规缂栧彿
     batchCode?: string; // 鎵规鍙�
+    reelNo?: string; // 璋冩嫧鎵规鐩樺彿
     fromWarehouseId?: number; // 绉诲嚭浠撳簱缂栧彿
     fromWarehouseName?: string; // 绉诲嚭浠撳簱鍚嶇О
     fromLocationId?: number; // 绉诲嚭搴撳尯缂栧彿
diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue
index dbe827e..8b59b28 100644
--- a/src/views/bpm/form/index.vue
+++ b/src/views/bpm/form/index.vue
@@ -153,7 +153,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['bpm:form:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/bpm/oa/notice/index.vue b/src/views/bpm/oa/notice/index.vue
index f80b6a2..0246d6e 100644
--- a/src/views/bpm/oa/notice/index.vue
+++ b/src/views/bpm/oa/notice/index.vue
@@ -139,7 +139,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['bpm:oa-notice:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/bpm/task/copy/index.vue b/src/views/bpm/task/copy/index.vue
index bf15aec..b4eca06 100644
--- a/src/views/bpm/task/copy/index.vue
+++ b/src/views/bpm/task/copy/index.vue
@@ -65,7 +65,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['bpm:task:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
index 80f8839..b999c29 100644
--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -63,7 +63,6 @@
               label: '鍔炵悊',
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['bpm:task:query'],
               onClick: handleAudit.bind(null, row),
             },
           ]"
diff --git a/src/views/dashboard/analytics/modules/biz-cards.vue b/src/views/dashboard/analytics/modules/biz-cards.vue
index 5fc8ff1..71b3ea0 100644
--- a/src/views/dashboard/analytics/modules/biz-cards.vue
+++ b/src/views/dashboard/analytics/modules/biz-cards.vue
@@ -23,11 +23,11 @@
 const saleCount = ref(0);
 const stockCount = ref(0);
 const bpmTodoCount = ref(0);
-const { canNavigate, canQuery } = useHomeAccess();
-const canViewPurchase = computed(() => canQuery('erp:purchase-order:query') && canNavigate('ErpPurchaseOrder'));
-const canViewSale = computed(() => canQuery('erp:sale-order:query') && canNavigate('ErpSaleOrder'));
-const canViewStock = computed(() => canQuery('mes:wm-material-stock:query') && canNavigate('MesWmMaterialStock'));
-const canViewBpmTodo = computed(() => canQuery('bpm:task:query') && canNavigate('BpmTaskTodo'));
+const { canNavigate } = useHomeAccess();
+const canViewPurchase = computed(() => canNavigate('ErpPurchaseOrder'));
+const canViewSale = computed(() => canNavigate('ErpSaleOrder'));
+const canViewStock = computed(() => canNavigate('MesWmMaterialStock'));
+const canViewBpmTodo = computed(() => canNavigate('BpmTaskTodo'));
 
 async function loadPurchase() {
   if (!canViewPurchase.value) return;
diff --git a/src/views/erp/finance/payment/index.vue b/src/views/erp/finance/payment/index.vue
index 2d5b675..fe77546 100644
--- a/src/views/erp/finance/payment/index.vue
+++ b/src/views/erp/finance/payment/index.vue
@@ -215,7 +215,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:finance-payment:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/finance/receipt/index.vue b/src/views/erp/finance/receipt/index.vue
index 512a3ff..1da964f 100644
--- a/src/views/erp/finance/receipt/index.vue
+++ b/src/views/erp/finance/receipt/index.vue
@@ -174,7 +174,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:finance-receipt:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/finance/voucher/index.vue b/src/views/erp/finance/voucher/index.vue
index bf9eca1..aae7acf 100644
--- a/src/views/erp/finance/voucher/index.vue
+++ b/src/views/erp/finance/voucher/index.vue
@@ -243,7 +243,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['finance:voucher:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/purchase/invoice/index.vue b/src/views/erp/purchase/invoice/index.vue
index 44cba30..330214b 100644
--- a/src/views/erp/purchase/invoice/index.vue
+++ b/src/views/erp/purchase/invoice/index.vue
@@ -171,7 +171,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:purchase-invoice:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/purchase/order/index.vue b/src/views/erp/purchase/order/index.vue
index 6189ea1..266decd 100644
--- a/src/views/erp/purchase/order/index.vue
+++ b/src/views/erp/purchase/order/index.vue
@@ -206,7 +206,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:purchase-order:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/purchase/request/index.vue b/src/views/erp/purchase/request/index.vue
index a0a8a00..733a788 100644
--- a/src/views/erp/purchase/request/index.vue
+++ b/src/views/erp/purchase/request/index.vue
@@ -262,7 +262,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:purchase-request:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index bec1872..478747d 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -362,14 +362,12 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['erp:sale-order:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
               label: '鎵撳嵃',
               type: 'link',
               icon: 'lucide:printer',
-              auth: ['erp:sale-order:query'],
               onClick: handlePrint.bind(null, row),
             },
             {
@@ -395,7 +393,6 @@
               label: '瀹℃壒杩涘害',
               type: 'link',
               icon: 'lucide:file-clock',
-              auth: ['erp:sale-order:query'],
               ifShow: () => row.status === 15 && !!row.processInstanceId,
               onClick: handleViewApproval.bind(null, row),
             },
diff --git a/src/views/im/manager/group/index.vue b/src/views/im/manager/group/index.vue
index b234d21..c2ea07a 100644
--- a/src/views/im/manager/group/index.vue
+++ b/src/views/im/manager/group/index.vue
@@ -133,7 +133,6 @@
               label: '璇︽儏',
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['im:manager:group:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/im/manager/message/group/index.vue b/src/views/im/manager/message/group/index.vue
index 2a97b5f..efcb86a 100644
--- a/src/views/im/manager/message/group/index.vue
+++ b/src/views/im/manager/message/group/index.vue
@@ -99,7 +99,6 @@
               label: '璇︽儏',
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['im:manager:message:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/im/manager/message/private/index.vue b/src/views/im/manager/message/private/index.vue
index 26bbcef..5d69084 100644
--- a/src/views/im/manager/message/private/index.vue
+++ b/src/views/im/manager/message/private/index.vue
@@ -90,7 +90,6 @@
               label: '璇︽儏',
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['im:manager:message:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/im/manager/rtc/index.vue b/src/views/im/manager/rtc/index.vue
index 8a0cdfb..d8ceb75 100644
--- a/src/views/im/manager/rtc/index.vue
+++ b/src/views/im/manager/rtc/index.vue
@@ -87,7 +87,6 @@
               label: '璇︽儏',
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['im:manager:rtc:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
index a311c03..4c14c62 100644
--- a/src/views/infra/apiAccessLog/index.vue
+++ b/src/views/infra/apiAccessLog/index.vue
@@ -90,7 +90,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['infra:api-access-log:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
index 88eda00..95976b0 100644
--- a/src/views/infra/apiErrorLog/index.vue
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -112,7 +112,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['infra:api-error-log:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
index b8d8678..0da9193 100644
--- a/src/views/infra/job/index.vue
+++ b/src/views/infra/job/index.vue
@@ -283,7 +283,6 @@
             {
               label: $t('common.detail'),
               type: 'link',
-              auth: ['infra:job:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue
index 4b6fa52..9381d32 100644
--- a/src/views/infra/job/logger/index.vue
+++ b/src/views/infra/job/logger/index.vue
@@ -87,7 +87,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['infra:job:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/dv/checkrecord/index.vue b/src/views/mes/dv/checkrecord/index.vue
index c87affd..ef87661 100644
--- a/src/views/mes/dv/checkrecord/index.vue
+++ b/src/views/mes/dv/checkrecord/index.vue
@@ -151,7 +151,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:dv-check-record:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index b2e4ee5..b9479a0 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -185,7 +185,6 @@
                   label: $t('common.detail'),
                   type: 'link',
                   icon: ACTION_ICON.VIEW,
-                  auth: ['mes:dv-machinery:query'],
                   onClick: handleDetail.bind(null, row),
                 },
               ]"
diff --git a/src/views/mes/dv/maintenrecord/index.vue b/src/views/mes/dv/maintenrecord/index.vue
index f1b2d90..8e5057c 100644
--- a/src/views/mes/dv/maintenrecord/index.vue
+++ b/src/views/mes/dv/maintenrecord/index.vue
@@ -151,7 +151,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:dv-mainten-record:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/dv/metering/index.vue b/src/views/mes/dv/metering/index.vue
index eddc3a1..b570e0d 100644
--- a/src/views/mes/dv/metering/index.vue
+++ b/src/views/mes/dv/metering/index.vue
@@ -184,7 +184,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:dv-metering:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/dv/meteringcheck/index.vue b/src/views/mes/dv/meteringcheck/index.vue
index c8039f3..ea08814 100644
--- a/src/views/mes/dv/meteringcheck/index.vue
+++ b/src/views/mes/dv/meteringcheck/index.vue
@@ -147,7 +147,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:dv-metering-check:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index 8d9995d..35d56e2 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -167,7 +167,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:dv-repair:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/pro/andon/record/index.vue b/src/views/mes/pro/andon/record/index.vue
index 9aecb3b..e3d64ca 100644
--- a/src/views/mes/pro/andon/record/index.vue
+++ b/src/views/mes/pro/andon/record/index.vue
@@ -143,7 +143,6 @@
             {
               label: '璇︽儏',
               type: 'link',
-              auth: ['mes:pro-andon-record:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index 0739c03..536b634 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -115,6 +115,11 @@
       width: 140,
     },
     {
+      field: 'reelNo',
+      title: '鐩樺彿',
+      minWidth: 140,
+    },
+    {
       field: 'productCode',
       title: '浜у搧缂栫爜',
       width: 120,
@@ -225,6 +230,14 @@
       },
     },
     {
+      fieldName: 'reelNo',
+      label: '鐩樺彿',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
       fieldName: 'type',
       label: '璁㈠崟绫诲瀷',
       component: 'Select',
@@ -295,12 +308,11 @@
       },
     },
     {
-      fieldName: 'status',
+      fieldName: 'statusLabel',
       label: '璁㈠崟鐘舵��',
-      component: 'Select',
+      component: 'Input',
       componentProps: {
         disabled: true,
-        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
       },
     },
     {
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index f459bfb..121b3e0 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -5,6 +5,8 @@
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
 
 import { Button, Card, message, Popconfirm, Steps } from 'ant-design-vue';
 
@@ -103,7 +105,12 @@
     try {
       workOrder.value = await getWorkOrder(data.id);
       // 璁剧疆鍒� values
-      await formApi.setValues(workOrder.value);
+      await formApi.setValues({
+        ...workOrder.value,
+        statusLabel: workOrder.value.status == null
+          ? '-'
+          : getDictLabel(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, workOrder.value.status) || '-',
+      });
       if (workOrder.value.productId) {
         await loadRouteProcesses(
           workOrder.value.id!,
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index 5906711..e776d9a 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -213,7 +213,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:qc-ipqc:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/qc/iqc/index.vue b/src/views/mes/qc/iqc/index.vue
index a2c7514..c85053e 100644
--- a/src/views/mes/qc/iqc/index.vue
+++ b/src/views/mes/qc/iqc/index.vue
@@ -226,7 +226,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:qc-iqc:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue
index 63cbd99..0844cbf 100644
--- a/src/views/mes/qc/oqc/index.vue
+++ b/src/views/mes/qc/oqc/index.vue
@@ -212,7 +212,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:qc-oqc:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/qc/rqc/data.ts b/src/views/mes/qc/rqc/data.ts
index 0f724b5..8bb1f3b 100644
--- a/src/views/mes/qc/rqc/data.ts
+++ b/src/views/mes/qc/rqc/data.ts
@@ -423,6 +423,7 @@
       title: '鎵规鍙�',
       width: 130,
     },
+    { field: 'reelNo', title: '鐩樺彿', width: 130 },
     {
       field: 'checkResult',
       title: '妫�娴嬬粨鏋�',
diff --git a/src/views/mes/qc/rqc/index.vue b/src/views/mes/qc/rqc/index.vue
index a5d1e36..b6a8866 100644
--- a/src/views/mes/qc/rqc/index.vue
+++ b/src/views/mes/qc/rqc/index.vue
@@ -173,7 +173,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['mes:qc-rqc:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index a9d23c4..2e47a3e 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -35,7 +35,7 @@
 const tabItems: WorkbenchTabItem[] = [
   { key: 'detail', label: '宸ュ崟璇︽儏', icon: 'lucide:file-text' },
   { key: 'feedback', label: '鎶ュ伐', icon: 'lucide:edit-3', auth: ['mes:pro-feedback:create'] },
-  { key: 'history', label: '鎶ュ伐璁板綍', icon: 'lucide:history' ,auth: ['mes:pro-feedback:query']},
+  { key: 'history', label: '鎶ュ伐璁板綍', icon: 'lucide:history' },
   { key: 'record-param', label: '鐢熶骇璁板綍鍙傛暟', icon: 'lucide:file-cog' },
   { key: 'product-issue', label: '棰嗘枡', icon: 'lucide:clipboard-list' },
   { key: 'return-issue', label: '閫�鏂�', icon: 'lucide:rotate-ccw' },
diff --git a/src/views/srm/supplierApply/index.vue b/src/views/srm/supplierApply/index.vue
index a99f15c..6adc250 100644
--- a/src/views/srm/supplierApply/index.vue
+++ b/src/views/srm/supplierApply/index.vue
@@ -160,7 +160,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['srm:supplier-apply:query'],
               onClick: handleDetail.bind(null, row),
             },
             {
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index 01450de..f1bc19f 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -87,7 +87,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:login-log:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue
index dd2f2aa..68675c8 100644
--- a/src/views/system/mail/log/index.vue
+++ b/src/views/system/mail/log/index.vue
@@ -75,7 +75,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:mail-log:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
index 15d18bb..0b30152 100644
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@@ -67,7 +67,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:notify-message:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 653c6c0..1de25b0 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -87,7 +87,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:operate-log:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
index c43bf4c..e8e59af 100644
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@@ -87,7 +87,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:sms-log:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/system/social/user/index.vue b/src/views/system/social/user/index.vue
index 1460b78..5bc4921 100644
--- a/src/views/system/social/user/index.vue
+++ b/src/views/system/social/user/index.vue
@@ -62,7 +62,6 @@
               label: $t('common.detail'),
               type: 'link',
               icon: ACTION_ICON.VIEW,
-              auth: ['system:social-user:query'],
               onClick: handleDetail.bind(null, row),
             },
           ]"
diff --git a/src/views/wls/barcode/index.vue b/src/views/wls/barcode/index.vue
index f549980..c7889fa 100644
--- a/src/views/wls/barcode/index.vue
+++ b/src/views/wls/barcode/index.vue
@@ -203,7 +203,6 @@
             {
               label: $t('common.detail'),
               type: 'link',
-              auth: ['mes:wm-barcode:query'],
               onClick: handleView.bind(null, row),
             },
             {
diff --git a/src/views/wls/batch/components/select.vue b/src/views/wls/batch/components/select.vue
index 4564f60..7447d9d 100644
--- a/src/views/wls/batch/components/select.vue
+++ b/src/views/wls/batch/components/select.vue
@@ -128,6 +128,7 @@
           <div>鐗╂枡缂栫爜锛歿{ selectedItem.itemCode || '-' }}</div>
           <div>鐗╂枡鍚嶇О锛歿{ selectedItem.itemName || '-' }}</div>
           <div>鐢熶骇鎵瑰彿锛歿{ selectedItem.lotNumber || '-' }}</div>
+          <div>鐩樺彿锛歿{ selectedItem.reelNo || '-' }}</div>
         </div>
       </template>
       <Input
diff --git a/src/views/wls/batch/data.ts b/src/views/wls/batch/data.ts
index dfa2066..27164e8 100644
--- a/src/views/wls/batch/data.ts
+++ b/src/views/wls/batch/data.ts
@@ -178,6 +178,11 @@
       width: 150,
     },
     {
+      field: 'reelNo',
+      title: '鐩樺彿',
+      width: 120,
+    },
+    {
       field: 'itemCode',
       title: '鐗╂枡缂栫爜',
       width: 150,
@@ -285,6 +290,10 @@
       label: '鎵规缂栧彿',
     },
     {
+      field: 'reelNo',
+      label: '鐩樺彿',
+    },
+    {
       field: 'itemCode',
       label: '鐗╂枡缂栫爜',
     },
diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index 53ad6ca..734da3e 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -21,6 +21,7 @@
 import { getItem } from '#/api/mdm/item';
 import { MdmItemSelect } from '#/views/basicData/mdm/components';
 import { SrmSupplierSelect } from '#/views/srm/supplier/components';
+import { WmBatchSelect } from '#/views/wls/batch/components';
 import BatchConfigDisplay from './batch-config-display.vue';
 import {
   WmWarehouseAreaSelect,
@@ -42,6 +43,7 @@
 const batchEnabled = ref(false);
 // 鏄惁鎵嬪姩濉啓鎵规鍙�
 const manualBatchEntry = ref(false);
+const hasExistingBatch = ref(false);
 // 鎵规閰嶇疆灞曠ず缁勪欢寮曠敤
 const batchConfigDisplayRef = ref<InstanceType<typeof BatchConfigDisplay>>();
 
@@ -69,7 +71,7 @@
   }
 
   const item = selectedItem.value;
-  const isIn = operateType.value === 1;
+  const isIn = operateType.value === 1 && !hasExistingBatch.value;
 
   formApi.updateSchema([
     { fieldName: 'batchCode', dependencies: { show: () => manualBatchEntry.value } },
@@ -86,6 +88,7 @@
 
 /** 鐗╂枡閫夋嫨鍙樺寲 */
 async function handleItemChange(item: MdmItemApi.Item | undefined) {
+  hasExistingBatch.value = false;
   selectedItem.value = item || null;
   if (item?.id) {
     const itemDetail = await getItem(item.id);
@@ -97,6 +100,7 @@
   }
   // 娓呯┖鎵规鐩稿叧鍊�
   await formApi.setFieldValue('batchCode', undefined);
+  await formApi.setFieldValue('batchId', undefined);
   await formApi.setFieldValue('produceDate', undefined);
   await formApi.setFieldValue('expireDate', undefined);
   await formApi.setFieldValue('manualBatchEntry', false);
@@ -158,6 +162,24 @@
         onChange: handleItemChange,
       },
       rules: 'selectRequired',
+    },
+    {
+      fieldName: 'batchId',
+      label: '宸叉湁鎵规/鐩樺彿',
+      component: markRaw(WmBatchSelect),
+      componentProps: { placeholder: '鍙�夋嫨宸叉湁杩芥函鎵规', disabled: true },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values: any) => ({
+          itemId: values.itemId,
+          disabled: !values.itemId,
+          placeholder: '鍙�夋嫨宸叉湁杩芥函鎵规',
+          onChange: async (batch: any) => {
+            hasExistingBatch.value = !!batch?.id;
+            await updateBatchFields();
+          },
+        }),
+      },
     },
     {
       fieldName: 'warehouseId',
@@ -402,6 +424,7 @@
       selectedWarehouse.value = null;
       selectedLocation.value = null;
       batchEnabled.value = false;
+      hasExistingBatch.value = false;
       operateType.value = 1;
       modalTitle.value = '搴撳瓨璋冩暣';
       return;
@@ -450,7 +473,7 @@
   const values = await formApi.getValues();
 
   // 鍚敤鎵规绠$悊鏃剁殑鏍¢獙
-  if (batchEnabled.value) {
+  if (batchEnabled.value && !values.batchId) {
     if (manualBatchEntry.value && !values.batchCode) {
       message.error('璇疯緭鍏ユ壒娆″彿');
       return;
@@ -494,6 +517,7 @@
         warehouseId: values.warehouseId,
         locationId: values.locationId,
         areaId: values.areaId,
+        batchId: values.batchId,
         batchCode: values.batchCode,
         produceDate: values.produceDate,
         expireDate: values.expireDate,
@@ -514,6 +538,7 @@
         warehouseId: values.warehouseId,
         locationId: values.locationId,
         areaId: values.areaId,
+        batchId: values.batchId,
         batchCode: values.batchCode,
         vendorId: values.vendorId,
         quantity: values.quantity,
diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index 923946c..e0fc891 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -433,6 +433,11 @@
       width: 100,
     },
     {
+      field: 'reelNo',
+      title: '閿�鍞洏鍙�',
+      minWidth: 120,
+    },
+    {
       field: 'batchCode',
       title: '鎵规鍙�',
       minWidth: 120,
@@ -567,6 +572,11 @@
 ): VxeTableGridOptions<MesWmProductSalesDetailApi.ProductSalesDetail>['columns'] {
   return [
     {
+      field: 'reelNo',
+      title: '鎷h揣鐩樺彿',
+      minWidth: 120,
+    },
+    {
       field: 'warehouseName',
       title: '浠撳簱鍚嶇О',
       minWidth: 100,
diff --git a/src/views/wls/returnsales/data.ts b/src/views/wls/returnsales/data.ts
index 8b96bbd..de9180c 100644
--- a/src/views/wls/returnsales/data.ts
+++ b/src/views/wls/returnsales/data.ts
@@ -308,6 +308,7 @@
       title: '鎵规鍙�',
       minWidth: 120,
     },
+    { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
     {
       field: 'rqcCheckFlag',
       title: '鏄惁闇�瑕佽川妫�',
@@ -355,13 +356,14 @@
       componentProps: hasItems
         ? {
             placeholder: '璇烽�夋嫨鐗╂枡',
-            options: items.map((item) => ({
+            options: items.filter((item, index) => items.findIndex((other) => other.productId === item.productId) === index).map((item) => ({
               label: `${item.productName || ''}锛�${item.productBarCode || ''}锛塦,
               value: item.productId,
             })),
             showSearch: true,
             onChange: (value: number | undefined) => {
-              const selected = items.find((i) => i.productId === value);
+              const matches = items.filter((i) => i.productId === value);
+              const selected = matches.length === 1 ? matches[0] : undefined;
               onItemChange?.(selected);
             },
           }
@@ -384,7 +386,8 @@
       dependencies: {
         triggerFields: ['itemId'],
         componentProps: (values) => {
-          const selected = items?.find((i) => i.productId === values.itemId);
+          const matches = items?.filter((i) => i.productId === values.itemId) ?? [];
+          const selected = matches.length === 1 ? matches[0] : undefined;
           return {
             class: '!w-full',
             max: selected?.count ?? undefined,
@@ -394,7 +397,8 @@
           };
         },
         rules: (values) => {
-          const selected = items?.find((i) => i.productId === values.itemId);
+          const matches = items?.filter((i) => i.productId === values.itemId) ?? [];
+          const selected = matches.length === 1 ? matches[0] : undefined;
           const max = selected?.count;
           if (max !== undefined && max !== null) {
             return z
@@ -413,7 +417,7 @@
       component: markRaw(WmBatchSelect),
       componentProps: {
         clientId,
-        disabled: true,
+        disabled: false,
         placeholder: '璇烽�夋嫨鎵规',
         salesOrderCode,
       },
@@ -421,7 +425,7 @@
         triggerFields: ['itemId'],
         componentProps: (values) => ({
           clientId,
-          disabled: true,
+          disabled: !values.itemId,
           itemId: values.itemId,
           placeholder: '璇烽�夋嫨鎵规',
           salesOrderCode,
@@ -452,6 +456,7 @@
   stockable: boolean,
 ): VxeTableGridOptions<MesWmReturnSalesDetailApi.ReturnSalesDetail>['columns'] {
   return [
+    { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
     {
       field: 'batchCode',
       title: '鎵规鍙�',
diff --git a/src/views/wls/returnsales/modules/form.vue b/src/views/wls/returnsales/modules/form.vue
index 2f57364..e06db63 100644
--- a/src/views/wls/returnsales/modules/form.vue
+++ b/src/views/wls/returnsales/modules/form.vue
@@ -167,6 +167,7 @@
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
+      saleOrderItems.value = [];
       originalSnapshot.value = '';
       return;
     }
@@ -201,10 +202,12 @@
           if (list?.length) {
             const orderId = list[0].id as number;
             (formData.value as Record<string, unknown>).saleOrderId = orderId;
-            const order = await getSaleOrder(orderId);
-            saleOrderItems.value = order?.items || [];
           }
         }
+        if (formData.value?.saleOrderId) {
+          const order = await getSaleOrder(formData.value.saleOrderId);
+          saleOrderItems.value = order?.items || [];
+        }
         // 璁剧疆鍒� values
         await formApi.setValues(formData.value);
       } finally {
diff --git a/src/views/wls/returnsales/modules/line-form.vue b/src/views/wls/returnsales/modules/line-form.vue
index 06adfaf..98ec33d 100644
--- a/src/views/wls/returnsales/modules/line-form.vue
+++ b/src/views/wls/returnsales/modules/line-form.vue
@@ -9,7 +9,6 @@
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import { getBatchPage } from '#/api/mes/wm/batch';
 import {
   createReturnSalesLine,
   getReturnSalesLine,
@@ -91,21 +90,6 @@
           maxQuantity.value = item?.count;
           // 閲嶇疆鎵规
           await formApi.setFieldValue('batchId', undefined);
-          if (item?.batchCode) {
-            try {
-              const batchPage = await getBatchPage({
-                code: item.batchCode,
-                pageNo: 1,
-                pageSize: 1,
-              });
-              const batchList = batchPage?.list;
-              if (batchList?.length) {
-                await formApi.setFieldValue('batchId', batchList[0].id);
-              }
-            } catch {
-              // 鏌ヨ澶辫触鏃跺拷鐣�
-            }
-          }
         },
       ),
     });
diff --git a/src/views/wls/salesnotice/data.ts b/src/views/wls/salesnotice/data.ts
index 6818446..34d4c56 100644
--- a/src/views/wls/salesnotice/data.ts
+++ b/src/views/wls/salesnotice/data.ts
@@ -318,6 +318,11 @@
       },
     },
     {
+      field: 'reelNo',
+      title: '鐩樺彿',
+      minWidth: 120,
+    },
+    {
       field: 'batchCode',
       title: '鎵规鍙�',
       minWidth: 120,
diff --git a/src/views/wls/salesnotice/modules/line-form.vue b/src/views/wls/salesnotice/modules/line-form.vue
index f33e49a..87e3c2d 100644
--- a/src/views/wls/salesnotice/modules/line-form.vue
+++ b/src/views/wls/salesnotice/modules/line-form.vue
@@ -1,13 +1,16 @@
 <script lang="ts" setup>
 import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { message } from 'ant-design-vue';
+import { message, Select } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getSaleOrderItemListByOrderId } from '#/api/erp/sale/order';
+import { getSalesNotice } from '#/api/mes/wm/salesnotice';
 import {
   createSalesNoticeLine,
   getSalesNoticeLine,
@@ -20,6 +23,18 @@
 const emit = defineEmits(['success']);
 const formData = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
 const noticeId = ref<number>(); // 鎵�灞為�氱煡鍗曠紪鍙�
+const saleOrderId = ref<number>();
+const saleOrderItemId = ref<number>();
+const saleItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
+const saleItemOptions = computed(() => saleItems.value.map((item) => ({
+  value: item.id,
+  label: `${item.productName || item.productId || '-'} / 鐩樺彿锛�${item.reelNo || '鏈~鍐�'} / 鏄庣粏锛�${item.id}`,
+})));
+
+async function handleSaleItemChange(id: number) {
+  const item = saleItems.value.find((entry) => entry.id === id);
+  if (item?.productId) await formApi.setFieldValue('itemId', item.productId);
+}
 
 const getTitle = computed(() => {
   return formData.value?.id
@@ -43,6 +58,10 @@
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
+    if (saleOrderId.value && !saleOrderItemId.value) {
+      message.warning('璇烽�夋嫨閿�鍞鍗曟槑缁�');
+      return;
+    }
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
@@ -52,6 +71,7 @@
     const data =
       (await formApi.getValues()) as MesWmSalesNoticeLineApi.SalesNoticeLine;
     data.noticeId = noticeId.value;
+    data.saleOrderItemId = saleOrderItemId.value;
     try {
       await (formData.value?.id
         ? updateSalesNoticeLine({ ...data, id: formData.value.id })
@@ -67,19 +87,26 @@
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
+      saleOrderId.value = undefined;
+      saleOrderItemId.value = undefined;
+      saleItems.value = [];
       return;
     }
     // 鍔犺浇鏁版嵁
     const data = modalApi.getData<{ id?: number; noticeId: number }>();
     noticeId.value = data.noticeId;
-    if (!data.id) {
-      return;
-    }
     modalApi.lock();
     try {
-      formData.value = await getSalesNoticeLine(data.id);
-      // 璁剧疆鍒� values
-      await formApi.setValues(formData.value);
+      const notice = await getSalesNotice(data.noticeId);
+      saleOrderId.value = notice.saleOrderId;
+      if (notice.saleOrderId) {
+        saleItems.value = await getSaleOrderItemListByOrderId(notice.saleOrderId);
+      }
+      if (data.id) {
+        formData.value = await getSalesNoticeLine(data.id);
+        saleOrderItemId.value = formData.value.saleOrderItemId;
+        await formApi.setValues(formData.value);
+      }
     } finally {
       modalApi.unlock();
     }
@@ -89,6 +116,11 @@
 
 <template>
   <Modal :title="getTitle" class="w-3/5">
+    <div v-if="saleOrderId" class="mx-4 mb-4 flex items-center gap-3">
+      <span>閿�鍞槑缁�</span>
+      <Select v-model:value="saleOrderItemId" class="flex-1" :options="saleItemOptions"
+        placeholder="璇烽�夋嫨閿�鍞鍗曟槑缁嗗拰鐩樺彿" @change="handleSaleItemChange" />
+    </div>
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/src/views/wls/transfer/data.ts b/src/views/wls/transfer/data.ts
index 864d701..cc83e1e 100644
--- a/src/views/wls/transfer/data.ts
+++ b/src/views/wls/transfer/data.ts
@@ -375,6 +375,7 @@
       title: '鎵规鍙�',
       minWidth: 120,
     },
+    { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
     {
       field: 'fromWarehouseName',
       title: '绉诲嚭浠撳簱',

--
Gitblit v1.9.3