From 166caaa72c0af0bedf304789a2950789ca742071 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Mar 2026 19:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/utils/constants.ts                    |  1 +
 .../mes/wm/arrivalnotice/ArrivalNoticeForm.vue      | 13 +++++++------
 .../mes/wm/arrivalnotice/ArrivalNoticeLineList.vue  |  7 +++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index bbc85da0e..50efc13b3 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -419,6 +419,7 @@ export const MesAutoCodeRuleCode = {
   MD_WORKSTATION_CODE: 'MD_WORKSTATION_CODE', // 工作站编码
   TM_TOOL_CODE: 'TM_TOOL_CODE', // 工具编码
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE', // 工具类型编码
+  WM_ARRIVAL_NOTICE_CODE: 'WM_ARRIVAL_NOTICE_CODE', // 到货通知单编码
   WM_ITEM_RECEIPT_CODE: 'WM_ITEM_RECEIPT_CODE', // 采购入库单编码
   WM_SN_CODE: 'WM_SN_CODE', // SN 码
   WM_PACKAGE_CODE: 'WM_PACKAGE_CODE', // 装箱单编码
diff --git a/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue b/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
index 27b844fc4..3a913c1ef 100644
--- a/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
+++ b/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
@@ -69,10 +69,10 @@
         </el-col>
       </el-row>
     </el-form>
-    <!-- 编辑时展示物料信息 -->
-    <template v-if="formType === 'update' && formData.id">
+    <!-- 编辑/详情时展示物料信息 -->
+    <template v-if="['update', 'detail'].includes(formType) && formData.id">
       <el-divider content-position="center">物料信息</el-divider>
-      <ArrivalNoticeLineList :notice-id="formData.id" />
+      <ArrivalNoticeLineList :notice-id="formData.id" :form-type="formType" />
     </template>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!isDetail">
@@ -84,7 +84,8 @@
 </template>
 
 <script setup lang="ts">
-import { generateRandomStr } from '@/utils'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 import { WmArrivalNoticeApi, WmArrivalNoticeVO } from '@/api/mes/wm/arrivalnotice'
 import ArrivalNoticeLineList from './ArrivalNoticeLineList.vue'
 import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
@@ -126,8 +127,8 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 /** 生成通知单编号 */
-const generateCode = () => {
-  formData.value.code = 'AN' + generateRandomStr(10)
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.WM_ARRIVAL_NOTICE_CODE)
 }
 
 /** 打开弹窗 */
diff --git a/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue b/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
index 74f6c730a..4134ed395 100644
--- a/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
+++ b/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
@@ -1,7 +1,7 @@
 <!-- MES 到货通知单行列表子组件 -->
 <template>
   <div class="overflow-hidden">
-    <el-button type="primary" plain @click="openForm('create')" class="mb-10px">
+    <el-button v-if="isEditable" type="primary" plain @click="openForm('create')" class="mb-10px">
       <Icon icon="ep:plus" class="mr-5px" /> 添加物料
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
@@ -18,7 +18,7 @@
       <el-table-column label="合格数量" align="center" prop="qualifiedQuantity" width="100" />
       <el-table-column label="检验单号" align="center" prop="iqcCode" min-width="140" />
       <el-table-column label="备注" align="center" prop="remark" min-width="120" />
-      <el-table-column label="操作" align="center" width="120">
+      <el-table-column v-if="isEditable" label="操作" align="center" width="120">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
           <el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
@@ -105,8 +105,11 @@ defineOptions({ name: 'ArrivalNoticeLineList' })
 
 const props = defineProps<{
   noticeId: number
+  formType?: string
 }>()
 
+const isEditable = computed(() => ['create', 'update'].includes(props.formType || ''))
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗