From fdcc30415aab617e876e417710a42f4c9737a3ed Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 28 Mar 2026 20:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=92=8C=E5=BA=93=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=90=88=E5=B9=B6=E6=B7=B7=E6=94=BE?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

整合物料混放和批次混放的设置接口为一个更新接口，简化了API调用。
同时，增加了库位和库区编码的生成逻辑，提升了用户体验。
---
 src/views/mes/utils/constants.ts              |  5 +-
 src/views/mes/wm/warehouse/WarehouseForm.vue  | 37 +++++++++---
 src/views/mes/wm/warehouse/area/AreaForm.vue  | 56 ++++++++++++-------
 src/views/mes/wm/warehouse/area/index.vue     |  9 ++-
 src/views/mes/wm/warehouse/index.vue          | 11 +++-
 .../wm/warehouse/location/LocationForm.vue    | 36 +++++++++---
 src/views/mes/wm/warehouse/location/index.vue |  9 ++-
 7 files changed, 120 insertions(+), 43 deletions(-)

diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index fb8d2f54f..b9da26ae6 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -424,7 +424,10 @@ export const MesAutoCodeRuleCode = {
   QC_IQC_CODE: 'QC_IQC_CODE', // 来料检验单编码
   QC_IPQC_CODE: 'QC_IPQC_CODE', // 过程检验单编码
   QC_OQC_CODE: 'QC_OQC_CODE', // 出货检验单编码
-  QC_RQC_CODE: 'QC_RQC_CODE' // 退货检验单编码
+  QC_RQC_CODE: 'QC_RQC_CODE', // 退货检验单编码
+  WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE', // 仓库编码
+  WM_LOCATION_CODE: 'WM_LOCATION_CODE', // 库区编码
+  WM_AREA_CODE: 'WM_AREA_CODE' // 库位编码
 } as const
 
 /** 获取物料/产品标识的标签 */
diff --git a/src/views/mes/wm/warehouse/WarehouseForm.vue b/src/views/mes/wm/warehouse/WarehouseForm.vue
index 8036f2e01..e90096aa8 100644
--- a/src/views/mes/wm/warehouse/WarehouseForm.vue
+++ b/src/views/mes/wm/warehouse/WarehouseForm.vue
@@ -6,12 +6,18 @@
       :rules="formRules"
       label-width="110px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row>
         <el-col :span="8">
-          <!-- TODO @AI：增加一个生成逻辑 -->
           <el-form-item label="仓库编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入仓库编码" />
+            <el-input v-model="formData.code" placeholder="请输入仓库编码">
+              <template #append>
+                <el-button @click="generateCode" :disabled="formType === 'update'">
+                  生成
+                </el-button>
+              </template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -69,15 +75,17 @@
       </el-row>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
 import { WmWarehouseApi, WmWarehouseVO } from '@/api/mes/wm/warehouse'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import * as UserApi from '@/api/system/user'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'WarehouseForm' })
 
@@ -85,10 +93,24 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogTitle = computed(() => {
+  const titles: Record<string, string> = {
+    create: '新增仓库',
+    update: '编辑仓库',
+    detail: '仓库详情'
+  }
+  return titles[formType.value] || formType.value
+})
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
+const isDetail = computed(() => formType.value === 'detail') // 是否详情模式（只读）
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+/** 生成仓库编码 */
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.WM_WAREHOUSE_CODE)
+}
+
 const formData = ref({
   id: undefined,
   code: undefined,
@@ -109,7 +131,6 @@ const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   // 加载用户列表
diff --git a/src/views/mes/wm/warehouse/area/AreaForm.vue b/src/views/mes/wm/warehouse/area/AreaForm.vue
index fd66577f6..6b7677380 100644
--- a/src/views/mes/wm/warehouse/area/AreaForm.vue
+++ b/src/views/mes/wm/warehouse/area/AreaForm.vue
@@ -6,6 +6,7 @@
       :rules="isDetail ? {} : formRules"
       label-width="120px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row>
         <el-col :span="8">
@@ -14,7 +15,7 @@
               v-model="selectedWarehouseId"
               placeholder="请选择仓库"
               class="!w-1/1"
-              :disabled="isDetail"
+
               @change="handleWarehouseChange"
             >
               <el-option
@@ -32,7 +33,7 @@
               v-model="formData.locationId"
               placeholder="请选择库区"
               class="!w-1/1"
-              :disabled="isDetail || !selectedWarehouseId"
+              :disabled="!selectedWarehouseId"
             >
               <el-option
                 v-for="location in locationList"
@@ -44,16 +45,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <!-- TODO @AI：增加一个生成逻辑 -->
           <el-form-item label="库位编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入库位编码" :disabled="isDetail" />
+            <el-input v-model="formData.code" placeholder="请输入库位编码">
+              <template #append>
+                <el-button @click="generateCode" :disabled="formType === 'update'">
+                  生成
+                </el-button>
+              </template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="库位名称" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入库位名称" :disabled="isDetail" />
+            <el-input v-model="formData.name" placeholder="请输入库位名称" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -64,7 +70,7 @@
               :min="0"
               controls-position="right"
               class="!w-1/1"
-              :disabled="isDetail"
+
             />
           </el-form-item>
         </el-col>
@@ -76,7 +82,7 @@
               :min="0"
               controls-position="right"
               class="!w-1/1"
-              :disabled="isDetail"
+
             />
           </el-form-item>
         </el-col>
@@ -89,7 +95,7 @@
               :min="0"
               controls-position="right"
               class="!w-1/1"
-              :disabled="isDetail"
+
             />
           </el-form-item>
         </el-col>
@@ -100,7 +106,7 @@
               :min="0"
               controls-position="right"
               class="!w-1/1"
-              :disabled="isDetail"
+
             />
           </el-form-item>
         </el-col>
@@ -111,7 +117,7 @@
               :min="0"
               controls-position="right"
               class="!w-1/1"
-              :disabled="isDetail"
+
             />
           </el-form-item>
         </el-col>
@@ -123,7 +129,6 @@
               v-model="formData.status"
               placeholder="请选择"
               class="!w-1/1"
-              :disabled="isDetail"
             >
               <el-option
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -136,19 +141,19 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否冻结" prop="frozen">
-            <el-switch v-model="formData.frozen" :disabled="isDetail" />
+            <el-switch v-model="formData.frozen" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="允许物料混放" prop="allowItemMixing">
-            <el-switch v-model="formData.allowItemMixing" :disabled="isDetail" />
+            <el-switch v-model="formData.allowItemMixing" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="允许批次混放" prop="allowBatchMixing">
-            <el-switch v-model="formData.allowBatchMixing" :disabled="isDetail" />
+            <el-switch v-model="formData.allowBatchMixing" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -159,7 +164,6 @@
               v-model="formData.remark"
               type="textarea"
               placeholder="请输入备注"
-              :disabled="isDetail"
             />
           </el-form-item>
         </el-col>
@@ -170,7 +174,7 @@
       <el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">
         确 定
       </el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button>
     </template>
   </Dialog>
 </template>
@@ -179,8 +183,10 @@
 import { WmWarehouseApi, WmWarehouseVO } from '@/api/mes/wm/warehouse'
 import { WmWarehouseLocationApi, WmWarehouseLocationVO } from '@/api/mes/wm/warehouse/location'
 import { WmWarehouseAreaApi, WmWarehouseAreaVO } from '@/api/mes/wm/warehouse/area'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'AreaForm' })
 
@@ -188,13 +194,26 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const dialogTitle = computed(() => {
+  const titles: Record<string, string> = {
+    create: '新增库位',
+    update: '编辑库位',
+    detail: '库位详情'
+  }
+  return titles[formType.value] || formType.value
+})
+const formLoading = ref(false) // 表单的加载中
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
 const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
 const selectedWarehouseId = ref<number | undefined>(undefined) // 当前选中的仓库 ID
 const warehouseList = ref<WmWarehouseVO[]>([]) // 仓库列表
 const locationList = ref<WmWarehouseLocationVO[]>([]) // 库区列表
+
+/** 生成库位编码 */
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.WM_AREA_CODE)
+}
+
 const formData = ref({
   id: undefined,
   code: undefined,
@@ -245,7 +264,6 @@ const open = async (
   defaultWarehouseId?: number
 ) => {
   dialogVisible.value = true
-  dialogTitle.value = type === 'detail' ? '库位详情' : t('action.' + type)
   formType.value = type
   resetForm()
   warehouseList.value = await WmWarehouseApi.getWarehouseSimpleList()
diff --git a/src/views/mes/wm/warehouse/area/index.vue b/src/views/mes/wm/warehouse/area/index.vue
index a41835d7f..ef6eb3f23 100644
--- a/src/views/mes/wm/warehouse/area/index.vue
+++ b/src/views/mes/wm/warehouse/area/index.vue
@@ -74,8 +74,13 @@
 
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：增加详情的操作 -->
-      <el-table-column label="库位编码" align="center" prop="code" min-width="120" />
+      <el-table-column label="库位编码" align="center" prop="code" min-width="120">
+        <template #default="scope">
+          <el-link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="库位名称" align="center" prop="name" min-width="140" />
       <el-table-column label="面积（㎡）" align="center" prop="area" min-width="90" />
       <el-table-column label="最大载重" align="center" prop="maxLoad" min-width="100" />
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 4c6c762f3..b30083244 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -48,8 +48,13 @@
 
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：增加详情的操作 -->
-      <el-table-column label="仓库编码" align="center" prop="code" min-width="120" />
+      <el-table-column label="仓库编码" align="center" prop="code" min-width="120">
+        <template #default="scope">
+          <el-link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="仓库名称" align="center" prop="name" min-width="140" />
       <el-table-column label="仓库地址" align="center" prop="address" min-width="150" />
       <el-table-column label="面积（㎡）" align="center" prop="area" min-width="100" />
@@ -75,7 +80,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" width="260">
+      <el-table-column label="操作" align="center" width="310">
         <template #default="scope">
           <el-button
             link
diff --git a/src/views/mes/wm/warehouse/location/LocationForm.vue b/src/views/mes/wm/warehouse/location/LocationForm.vue
index 300e1c141..295a1dc7a 100644
--- a/src/views/mes/wm/warehouse/location/LocationForm.vue
+++ b/src/views/mes/wm/warehouse/location/LocationForm.vue
@@ -6,12 +6,18 @@
       :rules="formRules"
       label-width="110px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row>
         <el-col :span="8">
-          <!-- TODO @AI：增加一个生成逻辑 -->
           <el-form-item label="库区编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入库区编码" />
+            <el-input v-model="formData.code" placeholder="请输入库区编码">
+              <template #append>
+                <el-button @click="generateCode" :disabled="formType === 'update'">
+                  生成
+                </el-button>
+              </template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -62,8 +68,8 @@
     </el-form>
     <template #footer>
       <!-- TODO @芋艿：barcodeimg -->
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button>
     </template>
   </Dialog>
 </template>
@@ -71,7 +77,9 @@
 <script setup lang="ts">
 import { WmWarehouseApi, WmWarehouseVO } from '@/api/mes/wm/warehouse'
 import { WmWarehouseLocationApi, WmWarehouseLocationVO } from '@/api/mes/wm/warehouse/location'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import { CommonStatusEnum } from '@/utils/constants'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'LocationForm' })
 
@@ -79,10 +87,23 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogTitle = computed(() => {
+  const titles: Record<string, string> = {
+    create: '新增库区',
+    update: '编辑库区',
+    detail: '库区详情'
+  }
+  return titles[formType.value] || formType.value
+})
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
+const isDetail = computed(() => formType.value === 'detail') // 是否详情模式（只读）
 const warehouseList = ref<WmWarehouseVO[]>([]) // 仓库列表
+
+/** 生成库区编码 */
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.WM_LOCATION_CODE)
+}
 const formData = ref({
   id: undefined,
   code: undefined,
@@ -104,7 +125,6 @@ const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
 const open = async (type: string, id?: number, defaultWarehouseId?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   warehouseList.value = await WmWarehouseApi.getWarehouseSimpleList()
diff --git a/src/views/mes/wm/warehouse/location/index.vue b/src/views/mes/wm/warehouse/location/index.vue
index 286ac2ab9..7f40c87ab 100644
--- a/src/views/mes/wm/warehouse/location/index.vue
+++ b/src/views/mes/wm/warehouse/location/index.vue
@@ -50,8 +50,13 @@
 
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：增加详情的操作 -->
-      <el-table-column label="库区编码" align="center" prop="code" min-width="120" />
+      <el-table-column label="库区编码" align="center" prop="code" min-width="120">
+        <template #default="scope">
+          <el-link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="库区名称" align="center" prop="name" min-width="140" />
       <el-table-column label="面积（㎡）" align="center" prop="area" min-width="100" />
       <el-table-column label="冻结" align="center" prop="frozen" min-width="80">