From c3737d3b7a97d310b367a3b6406b970ba97b2847 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 01:22:38 +0800
Subject: [PATCH 01/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20warehouse=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/warehouse/area/index.ts           |  45 ++++
 src/api/wms/warehouse/index.ts                |  44 ++++
 src/router/modules/remaining.ts               |  23 ++
 src/views/wms/utils/config.ts                 |  17 ++
 src/views/wms/warehouse/WarehouseForm.vue     | 116 ++++++++++
 .../wms/warehouse/area/WarehouseAreaForm.vue  | 137 ++++++++++++
 src/views/wms/warehouse/area/index.vue        | 211 ++++++++++++++++++
 src/views/wms/warehouse/index.vue             | 181 +++++++++++++++
 8 files changed, 774 insertions(+)
 create mode 100644 src/api/wms/warehouse/area/index.ts
 create mode 100644 src/api/wms/warehouse/index.ts
 create mode 100644 src/views/wms/utils/config.ts
 create mode 100644 src/views/wms/warehouse/WarehouseForm.vue
 create mode 100644 src/views/wms/warehouse/area/WarehouseAreaForm.vue
 create mode 100644 src/views/wms/warehouse/area/index.vue
 create mode 100644 src/views/wms/warehouse/index.vue

diff --git a/src/api/wms/warehouse/area/index.ts b/src/api/wms/warehouse/area/index.ts
new file mode 100644
index 000000000..e6acb247b
--- /dev/null
+++ b/src/api/wms/warehouse/area/index.ts
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// WMS 库区 VO
+export interface WarehouseAreaVO {
+  id?: number
+  code?: string
+  name?: string
+  warehouseId?: number
+  warehouseName?: string
+  remark?: string
+  createTime?: Date
+}
+
+// WMS 库区 API
+export const WarehouseAreaApi = {
+  // 查询库区分页
+  getWarehouseAreaPage: async (params: any) => {
+    return await request.get({ url: '/wms/warehouse-area/page', params })
+  },
+
+  // 查询库区精简列表
+  getWarehouseAreaSimpleList: async (warehouseId?: number) => {
+    return await request.get({ url: '/wms/warehouse-area/simple-list', params: { warehouseId } })
+  },
+
+  // 查询库区详情
+  getWarehouseArea: async (id: number) => {
+    return await request.get({ url: '/wms/warehouse-area/get?id=' + id })
+  },
+
+  // 新增库区
+  createWarehouseArea: async (data: WarehouseAreaVO) => {
+    return await request.post({ url: '/wms/warehouse-area/create', data })
+  },
+
+  // 修改库区
+  updateWarehouseArea: async (data: WarehouseAreaVO) => {
+    return await request.put({ url: '/wms/warehouse-area/update', data })
+  },
+
+  // 删除库区
+  deleteWarehouseArea: async (id: number) => {
+    return await request.delete({ url: '/wms/warehouse-area/delete?id=' + id })
+  }
+}
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
new file mode 100644
index 000000000..2ed849625
--- /dev/null
+++ b/src/api/wms/warehouse/index.ts
@@ -0,0 +1,44 @@
+import request from '@/config/axios'
+
+// WMS 仓库 VO
+export interface WarehouseVO {
+  id?: number
+  code?: string
+  name?: string
+  remark?: string
+  sort?: number
+  createTime?: Date
+}
+
+// WMS 仓库 API
+export const WarehouseApi = {
+  // 查询仓库分页
+  getWarehousePage: async (params: any) => {
+    return await request.get({ url: '/wms/warehouse/page', params })
+  },
+
+  // 查询仓库精简列表
+  getWarehouseSimpleList: async () => {
+    return await request.get({ url: '/wms/warehouse/simple-list' })
+  },
+
+  // 查询仓库详情
+  getWarehouse: async (id: number) => {
+    return await request.get({ url: '/wms/warehouse/get?id=' + id })
+  },
+
+  // 新增仓库
+  createWarehouse: async (data: WarehouseVO) => {
+    return await request.post({ url: '/wms/warehouse/create', data })
+  },
+
+  // 修改仓库
+  updateWarehouse: async (data: WarehouseVO) => {
+    return await request.put({ url: '/wms/warehouse/update', data })
+  },
+
+  // 删除仓库
+  deleteWarehouse: async (id: number) => {
+    return await request.delete({ url: '/wms/warehouse/delete?id=' + id })
+  }
+}
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index ac59b3ab0..1ed0b0627 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -127,6 +127,29 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/wms',
+    component: Layout,
+    name: 'Wms',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'warehouse/area/:warehouseId',
+        component: () => import('@/views/wms/warehouse/area/index.vue'),
+        name: 'WmsWarehouseArea',
+        meta: {
+          title: '库区管理',
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: '',
+          activeMenu: '/wms/basic/warehouse'
+        }
+      }
+    ]
+  },
   {
     path: '/codegen',
     component: Layout,
diff --git a/src/views/wms/utils/config.ts b/src/views/wms/utils/config.ts
new file mode 100644
index 000000000..7a6f79260
--- /dev/null
+++ b/src/views/wms/utils/config.ts
@@ -0,0 +1,17 @@
+/**
+ * WMS 前端运行参数
+ *
+ * 标注「后端镜像」的常量与 yudao.wms.* 配置默认值一致；调整后端配置时需同步修改这里
+ */
+
+// ==================== 后端镜像（与 WmsProperties 默认值对齐） ====================
+
+/** 是否启用库区模式（对齐 yudao.wms.area-enable） */
+export const AREA_ENABLE = true
+
+/**
+ * 是否启用批次/效期/库存明细模式（对齐 yudao.wms.batch-enable）
+ *
+ * 依赖 AREA_ENABLE = true
+ */
+export const BATCH_ENABLE = true
diff --git a/src/views/wms/warehouse/WarehouseForm.vue b/src/views/wms/warehouse/WarehouseForm.vue
new file mode 100644
index 000000000..e703117d4
--- /dev/null
+++ b/src/views/wms/warehouse/WarehouseForm.vue
@@ -0,0 +1,116 @@
+<!-- WMS 仓库表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="仓库名称" prop="name">
+        <el-input v-model="formData.name" maxlength="50" placeholder="请输入仓库名称" />
+      </el-form-item>
+      <el-form-item label="仓库编号" prop="code">
+        <el-input v-model="formData.code" maxlength="20" placeholder="请输入仓库编号" />
+      </el-form-item>
+      <el-form-item label="排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" class="!w-1/1" controls-position="right" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="formData.remark"
+          maxlength="255"
+          placeholder="请输入备注"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+
+/** WMS 仓库表单 */
+defineOptions({ name: 'WmsWarehouseForm' })
+
+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 formData = ref<WarehouseVO>({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  sort: 0,
+  remark: undefined
+})
+const formRules = reactive({
+  code: [{ required: true, message: '仓库编号不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await WarehouseApi.getWarehouse(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as WarehouseVO
+    if (formType.value === 'create') {
+      await WarehouseApi.createWarehouse(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WarehouseApi.updateWarehouse(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    name: undefined,
+    sort: 0,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/warehouse/area/WarehouseAreaForm.vue b/src/views/wms/warehouse/area/WarehouseAreaForm.vue
new file mode 100644
index 000000000..09195a47d
--- /dev/null
+++ b/src/views/wms/warehouse/area/WarehouseAreaForm.vue
@@ -0,0 +1,137 @@
+<!-- WMS 库区表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="所属仓库" prop="warehouseId">
+        <el-select v-model="formData.warehouseId" class="!w-1/1" placeholder="请选择所属仓库">
+          <el-option
+            v-for="warehouse in selectableWarehouseList"
+            :key="warehouse.id"
+            :label="warehouse.name"
+            :value="warehouse.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库区名称" prop="name">
+        <el-input v-model="formData.name" maxlength="60" placeholder="请输入库区名称" />
+      </el-form-item>
+      <el-form-item label="库区编号" prop="code">
+        <el-input v-model="formData.code" maxlength="20" placeholder="请输入库区编号" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="formData.remark"
+          maxlength="255"
+          placeholder="请输入备注"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/warehouse/area'
+
+/** WMS 库区表单 */
+defineOptions({ name: 'WmsWarehouseAreaForm' })
+
+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 warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
+const selectableWarehouseList = computed(() =>
+  warehouseList.value.filter((warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id)
+)
+const formData = ref<WarehouseAreaVO>({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  warehouseId: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  warehouseId: [{ required: true, message: '所属仓库不能为空', trigger: 'change' }],
+  code: [{ required: true, message: '库区编号不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '库区名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, warehouseId?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  await getWarehouseList()
+  if (warehouseId) {
+    formData.value.warehouseId = warehouseId
+  }
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await WarehouseAreaApi.getWarehouseArea(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 查询仓库精简列表 */
+const getWarehouseList = async () => {
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as WarehouseAreaVO
+    if (formType.value === 'create') {
+      await WarehouseAreaApi.createWarehouseArea(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WarehouseAreaApi.updateWarehouseArea(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    name: undefined,
+    warehouseId: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/warehouse/area/index.vue b/src/views/wms/warehouse/area/index.vue
new file mode 100644
index 000000000..fad5e2d16
--- /dev/null
+++ b/src/views/wms/warehouse/area/index.vue
@@ -0,0 +1,211 @@
+<!-- WMS 库区管理 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="所属仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          placeholder="请选择所属仓库"
+          @change="warehouseChange"
+        >
+          <el-option
+            v-for="warehouse in selectableWarehouseList"
+            :key="warehouse.id"
+            :label="warehouse.name"
+            :value="warehouse.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库区名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入库区名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库区编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入库区编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:warehouse-area:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="库区名称" prop="name" />
+      <el-table-column align="center" label="库区编号" prop="code" />
+      <el-table-column align="center" label="所属仓库" prop="warehouseName">
+        <template #default="scope">
+          {{ scope.row.warehouseName || getWarehouseName(scope.row.warehouseId) }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="center" label="操作" width="150">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['wms:warehouse-area:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:warehouse-area:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <WarehouseAreaForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/warehouse/area'
+import WarehouseAreaForm from './WarehouseAreaForm.vue'
+
+/** WMS 库区管理 */
+defineOptions({ name: 'WmsWarehouseArea' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref<WarehouseAreaVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  warehouseId: Number(route.params.warehouseId) || undefined,
+  code: undefined,
+  name: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
+const selectableWarehouseList = computed(() =>
+  warehouseList.value.filter((warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id)
+)
+
+/** 查询库区列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await WarehouseAreaApi.getWarehouseAreaPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 查询仓库精简列表 */
+const getWarehouseList = async () => {
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+}
+
+/** 获得仓库名称 */
+const getWarehouseName = (warehouseId?: number) => {
+  return warehouseList.value.find((warehouse) => warehouse.id === warehouseId)?.name
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 所属仓库更改同时更新列表数据 */
+const warehouseChange = () => {
+  handleQuery()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id, queryParams.warehouseId)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WarehouseAreaApi.deleteWarehouseArea(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getWarehouseList()
+  await getList()
+})
+</script>
diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/warehouse/index.vue
new file mode 100644
index 000000000..b0def6622
--- /dev/null
+++ b/src/views/wms/warehouse/index.vue
@@ -0,0 +1,181 @@
+<!-- WMS 仓库管理 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="仓库名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入仓库名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入仓库编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:warehouse:create']"
+          plain
+          type="primary"
+          @click="openWarehouseForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 仓库列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="仓库名称" prop="name" />
+      <el-table-column align="center" label="仓库编号" prop="code" />
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column align="center" label="排序" prop="sort" width="100" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="center" label="操作" width="210">
+        <template #default="scope">
+          <router-link
+            v-if="AREA_ENABLE"
+            :to="{ name: 'WmsWarehouseArea', params: { warehouseId: scope.row.id } }"
+          >
+            <el-button v-hasPermi="['wms:warehouse-area:query']" link type="primary">库区</el-button>
+          </router-link>
+          <el-button
+            v-hasPermi="['wms:warehouse:update']"
+            link
+            type="primary"
+            @click="openWarehouseForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:warehouse:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <WarehouseForm ref="formRef" @success="handleWarehouseSuccess" />
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
+import WarehouseForm from './WarehouseForm.vue'
+
+/** WMS 仓库管理 */
+defineOptions({ name: 'WmsWarehouse' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<WarehouseVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  name: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询仓库列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await WarehouseApi.getWarehousePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openWarehouseForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 仓库保存成功 */
+const handleWarehouseSuccess = async () => {
+  await getList()
+}
+
+/** 删除仓库 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WarehouseApi.deleteWarehouse(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await handleWarehouseSuccess()
+  } catch {}
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>

From 1aad2f1648b778743b4f52c765ed25e9e73152dc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 09:02:51 +0800
Subject: [PATCH 02/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=20md=20=E6=9B=B4=E6=95=B4=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/{ => md}/warehouse/area/index.ts                | 0
 src/api/wms/{ => md}/warehouse/index.ts                     | 0
 src/router/modules/remaining.ts                             | 6 +++---
 src/views/wms/{ => md}/warehouse/WarehouseForm.vue          | 2 +-
 src/views/wms/{ => md}/warehouse/area/WarehouseAreaForm.vue | 4 ++--
 src/views/wms/{ => md}/warehouse/area/index.vue             | 4 ++--
 src/views/wms/{ => md}/warehouse/index.vue                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/api/wms/{ => md}/warehouse/area/index.ts (100%)
 rename src/api/wms/{ => md}/warehouse/index.ts (100%)
 rename src/views/wms/{ => md}/warehouse/WarehouseForm.vue (98%)
 rename src/views/wms/{ => md}/warehouse/area/WarehouseAreaForm.vue (96%)
 rename src/views/wms/{ => md}/warehouse/area/index.vue (97%)
 rename src/views/wms/{ => md}/warehouse/index.vue (98%)

diff --git a/src/api/wms/warehouse/area/index.ts b/src/api/wms/md/warehouse/area/index.ts
similarity index 100%
rename from src/api/wms/warehouse/area/index.ts
rename to src/api/wms/md/warehouse/area/index.ts
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/md/warehouse/index.ts
similarity index 100%
rename from src/api/wms/warehouse/index.ts
rename to src/api/wms/md/warehouse/index.ts
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 1ed0b0627..a2ea1fbd9 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -136,8 +136,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'warehouse/area/:warehouseId',
-        component: () => import('@/views/wms/warehouse/area/index.vue'),
+        path: 'md/warehouse/area/:warehouseId',
+        component: () => import('@/views/wms/md/warehouse/area/index.vue'),
         name: 'WmsWarehouseArea',
         meta: {
           title: '库区管理',
@@ -145,7 +145,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
           hidden: true,
           canTo: true,
           icon: '',
-          activeMenu: '/wms/basic/warehouse'
+          activeMenu: '/wms/md/warehouse'
         }
       }
     ]
diff --git a/src/views/wms/warehouse/WarehouseForm.vue b/src/views/wms/md/warehouse/WarehouseForm.vue
similarity index 98%
rename from src/views/wms/warehouse/WarehouseForm.vue
rename to src/views/wms/md/warehouse/WarehouseForm.vue
index e703117d4..90b886d87 100644
--- a/src/views/wms/warehouse/WarehouseForm.vue
+++ b/src/views/wms/md/warehouse/WarehouseForm.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script lang="ts" setup>
-import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 
 /** WMS 仓库表单 */
 defineOptions({ name: 'WmsWarehouseForm' })
diff --git a/src/views/wms/warehouse/area/WarehouseAreaForm.vue b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
similarity index 96%
rename from src/views/wms/warehouse/area/WarehouseAreaForm.vue
rename to src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
index 09195a47d..9714886f1 100644
--- a/src/views/wms/warehouse/area/WarehouseAreaForm.vue
+++ b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
@@ -41,8 +41,8 @@
 </template>
 
 <script lang="ts" setup>
-import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
-import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/warehouse/area'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
 
 /** WMS 库区表单 */
 defineOptions({ name: 'WmsWarehouseAreaForm' })
diff --git a/src/views/wms/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
similarity index 97%
rename from src/views/wms/warehouse/area/index.vue
rename to src/views/wms/md/warehouse/area/index.vue
index fad5e2d16..39d041f8b 100644
--- a/src/views/wms/warehouse/area/index.vue
+++ b/src/views/wms/md/warehouse/area/index.vue
@@ -118,8 +118,8 @@
 
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
-import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
-import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/warehouse/area'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
 import WarehouseAreaForm from './WarehouseAreaForm.vue'
 
 /** WMS 库区管理 */
diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/md/warehouse/index.vue
similarity index 98%
rename from src/views/wms/warehouse/index.vue
rename to src/views/wms/md/warehouse/index.vue
index b0def6622..213cf29c7 100644
--- a/src/views/wms/warehouse/index.vue
+++ b/src/views/wms/md/warehouse/index.vue
@@ -105,7 +105,7 @@
 
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
-import { WarehouseApi, WarehouseVO } from '@/api/wms/warehouse'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 import { AREA_ENABLE } from '@/views/wms/utils/config'
 import WarehouseForm from './WarehouseForm.vue'
 

From 30e4fef7bb6dc029367059e5fadd06efdb5bac0b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 16:38:25 +0800
Subject: [PATCH 03/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=93=81=E7=89=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/item/brand/index.ts            |  46 ++++
 src/api/wms/md/item/category/index.ts         |  45 ++++
 src/api/wms/md/warehouse/area/index.ts        |   5 +
 src/api/wms/md/warehouse/index.ts             |   5 +
 src/views/wms/md/item/brand/ItemBrandForm.vue |  94 ++++++++
 src/views/wms/md/item/brand/index.vue         | 183 ++++++++++++++++
 .../wms/md/item/category/ItemCategoryForm.vue | 144 +++++++++++++
 src/views/wms/md/item/category/index.vue      | 202 ++++++++++++++++++
 src/views/wms/md/warehouse/area/index.vue     |  27 +++
 src/views/wms/md/warehouse/index.vue          |  27 +++
 10 files changed, 778 insertions(+)
 create mode 100644 src/api/wms/md/item/brand/index.ts
 create mode 100644 src/api/wms/md/item/category/index.ts
 create mode 100644 src/views/wms/md/item/brand/ItemBrandForm.vue
 create mode 100644 src/views/wms/md/item/brand/index.vue
 create mode 100644 src/views/wms/md/item/category/ItemCategoryForm.vue
 create mode 100644 src/views/wms/md/item/category/index.vue

diff --git a/src/api/wms/md/item/brand/index.ts b/src/api/wms/md/item/brand/index.ts
new file mode 100644
index 000000000..e54d62c18
--- /dev/null
+++ b/src/api/wms/md/item/brand/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+// WMS 商品品牌 VO
+export interface ItemBrandVO {
+  id?: number
+  name?: string
+  createTime?: Date
+}
+
+// WMS 商品品牌 API
+export const ItemBrandApi = {
+  // 查询商品品牌分页
+  getItemBrandPage: async (params: any) => {
+    return await request.get({ url: '/wms/item-brand/page', params })
+  },
+
+  // 查询商品品牌精简列表
+  getItemBrandSimpleList: async () => {
+    return await request.get({ url: '/wms/item-brand/simple-list' })
+  },
+
+  // 查询商品品牌详情
+  getItemBrand: async (id: number) => {
+    return await request.get({ url: '/wms/item-brand/get?id=' + id })
+  },
+
+  // 新增商品品牌
+  createItemBrand: async (data: ItemBrandVO) => {
+    return await request.post({ url: '/wms/item-brand/create', data })
+  },
+
+  // 修改商品品牌
+  updateItemBrand: async (data: ItemBrandVO) => {
+    return await request.put({ url: '/wms/item-brand/update', data })
+  },
+
+  // 删除商品品牌
+  deleteItemBrand: async (id: number) => {
+    return await request.delete({ url: '/wms/item-brand/delete?id=' + id })
+  },
+
+  // 导出商品品牌
+  exportItemBrand: async (params) => {
+    return await request.download({ url: '/wms/item-brand/export-excel', params })
+  }
+}
diff --git a/src/api/wms/md/item/category/index.ts b/src/api/wms/md/item/category/index.ts
new file mode 100644
index 000000000..98c66312d
--- /dev/null
+++ b/src/api/wms/md/item/category/index.ts
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// WMS 商品分类 VO
+export interface ItemCategoryVO {
+  id?: number
+  parentId?: number
+  name?: string
+  sort?: number
+  status?: number
+  createTime?: Date
+  children?: ItemCategoryVO[]
+}
+
+// WMS 商品分类 API
+export const ItemCategoryApi = {
+  // 查询商品分类列表
+  getItemCategoryList: async (params?: any) => {
+    return await request.get({ url: '/wms/item-category/list', params })
+  },
+
+  // 查询商品分类精简列表
+  getItemCategorySimpleList: async () => {
+    return await request.get({ url: '/wms/item-category/simple-list' })
+  },
+
+  // 查询商品分类详情
+  getItemCategory: async (id: number) => {
+    return await request.get({ url: '/wms/item-category/get?id=' + id })
+  },
+
+  // 新增商品分类
+  createItemCategory: async (data: ItemCategoryVO) => {
+    return await request.post({ url: '/wms/item-category/create', data })
+  },
+
+  // 修改商品分类
+  updateItemCategory: async (data: ItemCategoryVO) => {
+    return await request.put({ url: '/wms/item-category/update', data })
+  },
+
+  // 删除商品分类
+  deleteItemCategory: async (id: number) => {
+    return await request.delete({ url: '/wms/item-category/delete?id=' + id })
+  }
+}
diff --git a/src/api/wms/md/warehouse/area/index.ts b/src/api/wms/md/warehouse/area/index.ts
index e6acb247b..9ef9c3ad4 100644
--- a/src/api/wms/md/warehouse/area/index.ts
+++ b/src/api/wms/md/warehouse/area/index.ts
@@ -41,5 +41,10 @@ export const WarehouseAreaApi = {
   // 删除库区
   deleteWarehouseArea: async (id: number) => {
     return await request.delete({ url: '/wms/warehouse-area/delete?id=' + id })
+  },
+
+  // 导出库区
+  exportWarehouseArea: async (params) => {
+    return await request.download({ url: '/wms/warehouse-area/export-excel', params })
   }
 }
diff --git a/src/api/wms/md/warehouse/index.ts b/src/api/wms/md/warehouse/index.ts
index 2ed849625..b08bd965f 100644
--- a/src/api/wms/md/warehouse/index.ts
+++ b/src/api/wms/md/warehouse/index.ts
@@ -40,5 +40,10 @@ export const WarehouseApi = {
   // 删除仓库
   deleteWarehouse: async (id: number) => {
     return await request.delete({ url: '/wms/warehouse/delete?id=' + id })
+  },
+
+  // 导出仓库
+  exportWarehouse: async (params) => {
+    return await request.download({ url: '/wms/warehouse/export-excel', params })
   }
 }
diff --git a/src/views/wms/md/item/brand/ItemBrandForm.vue b/src/views/wms/md/item/brand/ItemBrandForm.vue
new file mode 100644
index 000000000..0187e54e4
--- /dev/null
+++ b/src/views/wms/md/item/brand/ItemBrandForm.vue
@@ -0,0 +1,94 @@
+<!-- WMS 商品品牌表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="品牌名称" prop="name">
+        <el-input v-model="formData.name" maxlength="30" placeholder="请输入品牌名称" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ItemBrandApi, ItemBrandVO } from '@/api/wms/md/item/brand'
+
+/** WMS 商品品牌表单 */
+defineOptions({ name: 'WmsItemBrandForm' })
+
+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 formData = ref<ItemBrandVO>({
+  id: undefined,
+  name: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '品牌名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ItemBrandApi.getItemBrand(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ItemBrandVO
+    if (formType.value === 'create') {
+      await ItemBrandApi.createItemBrand(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemBrandApi.updateItemBrand(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/md/item/brand/index.vue b/src/views/wms/md/item/brand/index.vue
new file mode 100644
index 000000000..ab342d1ba
--- /dev/null
+++ b/src/views/wms/md/item/brand/index.vue
@@ -0,0 +1,183 @@
+<!-- WMS 商品品牌管理 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="品牌名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入品牌名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:item-brand:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:item-brand:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 品牌列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="品牌名称" prop="name" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="center" label="操作" width="160">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['wms:item-brand:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:item-brand:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ItemBrandForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import { ItemBrandApi, ItemBrandVO } from '@/api/wms/md/item/brand'
+import ItemBrandForm from './ItemBrandForm.vue'
+import download from '@/utils/download'
+
+/** WMS 商品品牌管理 */
+defineOptions({ name: 'WmsItemBrand' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ItemBrandVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询商品品牌列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ItemBrandApi.getItemBrandPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除品牌 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemBrandApi.deleteItemBrand(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemBrandApi.exportItemBrand(queryParams)
+    download.excel(data, '商品品牌.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/md/item/category/ItemCategoryForm.vue b/src/views/wms/md/item/category/ItemCategoryForm.vue
new file mode 100644
index 000000000..443f4de21
--- /dev/null
+++ b/src/views/wms/md/item/category/ItemCategoryForm.vue
@@ -0,0 +1,144 @@
+<!-- WMS 商品分类表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="上级分类" prop="parentId">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="categoryTree"
+          :props="defaultProps"
+          check-strictly
+          default-expand-all
+          placeholder="请选择上级分类"
+          value-key="categoryId"
+        />
+      </el-form-item>
+      <el-form-item label="分类名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入分类名称" />
+      </el-form-item>
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" class="!w-1/1" controls-position="right" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { CommonStatusEnum } from '@/utils/constants'
+import { FormRules } from 'element-plus'
+import { ItemCategoryApi, ItemCategoryVO } from '@/api/wms/md/item/category'
+
+/** WMS 商品分类表单 */
+defineOptions({ name: 'WmsItemCategoryForm' })
+
+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 formData = ref<ItemCategoryVO>({
+  id: undefined,
+  parentId: undefined,
+  name: undefined,
+  sort: 0,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive<FormRules>({
+  parentId: [{ required: true, message: '上级分类不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const categoryTree = ref() // 树形结构
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, parentId?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm(parentId)
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ItemCategoryApi.getItemCategory(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得分类树
+  await getTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 获得分类树 */
+const getTree = async () => {
+  categoryTree.value = []
+  const data = await ItemCategoryApi.getItemCategorySimpleList()
+  let category: Tree = { id: 0, name: '顶级分类', children: [] }
+  category.children = handleTree(data, 'id', 'parentId')
+  categoryTree.value.push(category)
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ItemCategoryVO
+    if (formType.value === 'create') {
+      await ItemCategoryApi.createItemCategory(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemCategoryApi.updateItemCategory(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (parentId?: number) => {
+  formData.value = {
+    id: undefined,
+    parentId,
+    name: undefined,
+    sort: 0,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/md/item/category/index.vue b/src/views/wms/md/item/category/index.vue
new file mode 100644
index 000000000..c62ef651c
--- /dev/null
+++ b/src/views/wms/md/item/category/index.vue
@@ -0,0 +1,202 @@
+<!-- WMS 商品分类管理 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="分类名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入分类名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分类状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择分类状态"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:item-category:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button plain type="danger" @click="toggleExpandAll">
+          <Icon class="mr-5px" icon="ep:sort" />
+          展开/折叠
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 分类列表 -->
+  <ContentWrap>
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="list"
+      :default-expand-all="isExpandAll"
+      :show-overflow-tooltip="true"
+      :stripe="true"
+      row-key="id"
+    >
+      <el-table-column label="分类名称" prop="name" />
+      <el-table-column align="center" label="排序" prop="sort" width="120" />
+      <el-table-column align="center" label="状态" prop="status" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="center" label="操作" width="240">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['wms:item-category:create']"
+            link
+            type="primary"
+            @click="openForm('create', undefined, scope.row.id)"
+          >
+            新增下级
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:item-category:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:item-category:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ItemCategoryForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+import { ItemCategoryApi, ItemCategoryVO } from '@/api/wms/md/item/category'
+import ItemCategoryForm from './ItemCategoryForm.vue'
+
+/** WMS 商品分类管理 */
+defineOptions({ name: 'WmsItemCategory' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ItemCategoryVO[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  name: undefined,
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+
+/** 查询商品分类列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ItemCategoryApi.getItemCategoryList(queryParams)
+    list.value = handleTree(data, 'id', 'parentId')
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number, parentId?: number) => {
+  formRef.value.open(type, id, parentId)
+}
+
+/** 删除分类 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemCategoryApi.deleteItemCategory(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/md/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
index 39d041f8b..1c51fefc5 100644
--- a/src/views/wms/md/warehouse/area/index.vue
+++ b/src/views/wms/md/warehouse/area/index.vue
@@ -60,6 +60,16 @@
           <Icon class="mr-5px" icon="ep:plus" />
           新增
         </el-button>
+        <el-button
+          v-hasPermi="['wms:warehouse-area:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -121,6 +131,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
 import WarehouseAreaForm from './WarehouseAreaForm.vue'
+import download from '@/utils/download'
 
 /** WMS 库区管理 */
 defineOptions({ name: 'WmsWarehouseArea' })
@@ -140,6 +151,7 @@ const queryParams = reactive({
   name: undefined
 })
 const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
 const selectableWarehouseList = computed(() =>
   warehouseList.value.filter((warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id)
@@ -203,6 +215,21 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WarehouseAreaApi.exportWarehouseArea(queryParams)
+    download.excel(data, '库区.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 /** 初始化 */
 onMounted(async () => {
   await getWarehouseList()
diff --git a/src/views/wms/md/warehouse/index.vue b/src/views/wms/md/warehouse/index.vue
index 213cf29c7..329f3caad 100644
--- a/src/views/wms/md/warehouse/index.vue
+++ b/src/views/wms/md/warehouse/index.vue
@@ -45,6 +45,16 @@
           <Icon class="mr-5px" icon="ep:plus" />
           新增
         </el-button>
+        <el-button
+          v-hasPermi="['wms:warehouse:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -108,6 +118,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 import { AREA_ENABLE } from '@/views/wms/utils/config'
 import WarehouseForm from './WarehouseForm.vue'
+import download from '@/utils/download'
 
 /** WMS 仓库管理 */
 defineOptions({ name: 'WmsWarehouse' })
@@ -125,6 +136,7 @@ const queryParams = reactive({
   name: undefined
 })
 const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 
 /** 查询仓库列表 */
 const getList = async () => {
@@ -174,6 +186,21 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WarehouseApi.exportWarehouse(queryParams)
+    download.excel(data, '仓库.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 /** 初始化 */
 onMounted(() => {
   getList()

From d8907811496931d38e4fa69b37f16301d7b9b87e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 21:33:42 +0800
Subject: [PATCH 04/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E3=80=81?=
 =?UTF-8?q?SKU=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/item/index.ts                  |  55 +++
 src/api/wms/md/item/sku/index.ts              |  23 ++
 src/views/wms/md/item/ItemForm.vue            | 291 ++++++++++++++++
 .../item/brand/components/ItemBrandSelect.vue |  81 +++++
 .../wms/md/item/category/ItemCategoryForm.vue |   7 +-
 .../components/ItemCategorySelect.vue         |  57 ++++
 .../category/components/ItemCategoryTree.vue  | 100 ++++++
 src/views/wms/md/item/index.vue               | 312 ++++++++++++++++++
 src/views/wms/md/warehouse/WarehouseForm.vue  |   7 +-
 .../md/warehouse/area/WarehouseAreaForm.vue   |   4 +-
 src/views/wms/md/warehouse/area/index.vue     |   4 +-
 src/views/wms/md/warehouse/index.vue          |   4 +-
 src/views/wms/utils/format.ts                 |  62 ++++
 13 files changed, 1002 insertions(+), 5 deletions(-)
 create mode 100644 src/api/wms/md/item/index.ts
 create mode 100644 src/api/wms/md/item/sku/index.ts
 create mode 100644 src/views/wms/md/item/ItemForm.vue
 create mode 100644 src/views/wms/md/item/brand/components/ItemBrandSelect.vue
 create mode 100644 src/views/wms/md/item/category/components/ItemCategorySelect.vue
 create mode 100644 src/views/wms/md/item/category/components/ItemCategoryTree.vue
 create mode 100644 src/views/wms/md/item/index.vue
 create mode 100644 src/views/wms/utils/format.ts

diff --git a/src/api/wms/md/item/index.ts b/src/api/wms/md/item/index.ts
new file mode 100644
index 000000000..77ad3f12d
--- /dev/null
+++ b/src/api/wms/md/item/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+import { ItemSkuVO } from './sku'
+
+// WMS 商品 VO
+export interface ItemVO {
+  id?: number
+  code?: string
+  name?: string
+  categoryId?: number
+  categoryName?: string
+  unit?: string
+  brandId?: number
+  brandName?: string
+  remark?: string
+  skus?: ItemSkuVO[]
+  createTime?: Date
+}
+
+// WMS 商品 API
+export const ItemApi = {
+  // 查询商品分页
+  getItemPage: async (params: any) => {
+    return await request.get({ url: '/wms/item/page', params })
+  },
+
+  // 查询商品精简列表
+  getItemSimpleList: async (params?: any) => {
+    return await request.get({ url: '/wms/item/simple-list', params })
+  },
+
+  // 查询商品详情
+  getItem: async (id: number) => {
+    return await request.get({ url: '/wms/item/get?id=' + id })
+  },
+
+  // 新增商品
+  createItem: async (data: ItemVO) => {
+    return await request.post({ url: '/wms/item/create', data })
+  },
+
+  // 修改商品
+  updateItem: async (data: ItemVO) => {
+    return await request.put({ url: '/wms/item/update', data })
+  },
+
+  // 删除商品
+  deleteItem: async (id: number) => {
+    return await request.delete({ url: '/wms/item/delete?id=' + id })
+  },
+
+  // 导出商品
+  exportItem: async (params: any) => {
+    return await request.download({ url: '/wms/item/export-excel', params })
+  }
+}
diff --git a/src/api/wms/md/item/sku/index.ts b/src/api/wms/md/item/sku/index.ts
new file mode 100644
index 000000000..be07f41ff
--- /dev/null
+++ b/src/api/wms/md/item/sku/index.ts
@@ -0,0 +1,23 @@
+// WMS 商品 SKU VO
+export interface ItemSkuVO {
+  id?: number
+  name?: string
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  categoryId?: number
+  categoryName?: string
+  unit?: string
+  brandId?: number
+  brandName?: string
+  barCode?: string
+  code?: string
+  length?: number
+  width?: number
+  height?: number
+  grossWeight?: number
+  netWeight?: number
+  costPrice?: number
+  sellingPrice?: number
+  createTime?: Date
+}
diff --git a/src/views/wms/md/item/ItemForm.vue b/src/views/wms/md/item/ItemForm.vue
new file mode 100644
index 000000000..d0b5aa5c6
--- /dev/null
+++ b/src/views/wms/md/item/ItemForm.vue
@@ -0,0 +1,291 @@
+<!-- WMS 商品表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1200px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="88px"
+    >
+      <!-- 基础信息 -->
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="商品名称" prop="name">
+            <el-input v-model="formData.name" maxlength="60" placeholder="请输入商品名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商品分类" prop="categoryId">
+            <ItemCategorySelect v-model="formData.categoryId" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商品编号" prop="code">
+            <el-input v-model="formData.code" maxlength="20" placeholder="请输入商品编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商品单位" prop="unit">
+            <el-input v-model="formData.unit" maxlength="20" placeholder="请输入单位" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商品品牌" prop="brandId">
+            <ItemBrandSelect v-model="formData.brandId" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 规格信息 -->
+      <div class="mb-12px flex items-center justify-between">
+        <span class="text-14px font-bold">规格</span>
+        <el-button plain type="primary" @click="handleAddSku">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增规格
+        </el-button>
+      </div>
+      <el-table :data="formData.skus" border>
+        <el-table-column label="规格名称" min-width="150">
+          <template #default="scope">
+            <el-form-item
+              :prop="'skus.' + scope.$index + '.name'"
+              :rules="skuNameRules"
+              class="!mb-0 !w-1/1"
+              label-width="0"
+            >
+              <el-input
+                v-model="scope.row.name"
+                maxlength="255"
+                class="!w-1/1"
+                placeholder="请输入规格名称"
+              />
+            </el-form-item>
+          </template>
+        </el-table-column>
+        <el-table-column label="编号/条码" width="220">
+          <template #default="scope">
+            <el-input v-model="scope.row.code" maxlength="64" class="!w-1/1" placeholder="编号" />
+            <el-input
+              v-model="scope.row.barCode"
+              maxlength="64"
+              class="!w-1/1 mt-5px"
+              placeholder="条码为空时，提交后自动生成"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="长/宽/高(cm)" width="210">
+          <template #default="scope">
+            <div class="flex w-1/1 gap-5px">
+              <el-input-number
+                v-model="scope.row.length"
+                :controls="false"
+                :min="0"
+                :precision="DIMENSION_PRECISION"
+                class="!w-1/3"
+                placeholder="长"
+              />
+              <el-input-number
+                v-model="scope.row.width"
+                :controls="false"
+                :min="0"
+                :precision="DIMENSION_PRECISION"
+                class="!w-1/3"
+                placeholder="宽"
+              />
+              <el-input-number
+                v-model="scope.row.height"
+                :controls="false"
+                :min="0"
+                :precision="DIMENSION_PRECISION"
+                class="!w-1/3"
+                placeholder="高"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="净重/毛重(kg)" width="180">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.netWeight"
+              :controls="false"
+              :min="0"
+              :precision="WEIGHT_PRECISION"
+              class="!w-1/1"
+              placeholder="净重"
+            />
+            <el-input-number
+              v-model="scope.row.grossWeight"
+              :controls="false"
+              :min="0"
+              :precision="WEIGHT_PRECISION"
+              class="!w-1/1 mt-5px"
+              placeholder="毛重"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="成本价/销售价" width="180">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.costPrice"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="成本价"
+            />
+            <el-input-number
+              v-model="scope.row.sellingPrice"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1 mt-5px"
+              placeholder="销售价"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="scope">
+            <el-button link type="danger" @click="handleDeleteSku(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { FormRules } from 'element-plus'
+import { ItemApi, ItemVO } from '@/api/wms/md/item'
+import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import { DIMENSION_PRECISION, PRICE_PRECISION, WEIGHT_PRECISION } from '@/views/wms/utils/format'
+import ItemBrandSelect from './brand/components/ItemBrandSelect.vue'
+import ItemCategorySelect from './category/components/ItemCategorySelect.vue'
+
+/** WMS 商品表单 */
+defineOptions({ name: 'WmsItemForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref<ItemVO>({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  categoryId: undefined,
+  unit: undefined,
+  brandId: undefined,
+  remark: undefined,
+  skus: []
+})
+const formRules = reactive<FormRules>({
+  name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
+  categoryId: [{ required: true, message: '商品分类不能为空', trigger: 'change' }],
+  skus: [{ required: true, message: '至少包含一个商品规格', trigger: 'change' }]
+})
+const skuNameRules = [{ required: true, message: '规格名称不能为空', trigger: 'blur' }]
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const item = await ItemApi.getItem(id)
+      formData.value = {
+        ...item,
+        skus: item.skus?.length ? item.skus : [buildEmptySku()]
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 构建空规格 */
+const buildEmptySku = (): ItemSkuVO => ({
+  id: undefined,
+  name: undefined,
+  barCode: undefined,
+  code: undefined,
+  length: undefined,
+  width: undefined,
+  height: undefined,
+  grossWeight: undefined,
+  netWeight: undefined,
+  costPrice: undefined,
+  sellingPrice: undefined
+})
+
+/** 添加规格 */
+const handleAddSku = () => {
+  formData.value.skus?.push(buildEmptySku())
+}
+
+/** 删除规格 */
+const handleDeleteSku = (index: number) => {
+  if (!formData.value.skus || formData.value.skus.length <= 1) {
+    message.error('至少包含一个商品规格')
+    return
+  }
+  formData.value.skus.splice(index, 1)
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ItemVO
+    if (formType.value === 'create') {
+      await ItemApi.createItem(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemApi.updateItem(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    name: undefined,
+    categoryId: undefined,
+    unit: undefined,
+    brandId: undefined,
+    remark: undefined,
+    skus: [buildEmptySku()]
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/md/item/brand/components/ItemBrandSelect.vue b/src/views/wms/md/item/brand/components/ItemBrandSelect.vue
new file mode 100644
index 000000000..87ea86a71
--- /dev/null
+++ b/src/views/wms/md/item/brand/components/ItemBrandSelect.vue
@@ -0,0 +1,81 @@
+<!-- WMS 商品品牌选择器 -->
+<template>
+  <el-select
+    v-bind="$attrs"
+    v-model="selectValue"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filter-method="handleFilter"
+    :placeholder="placeholder"
+    class="w-1/1"
+    filterable
+    @change="handleChange"
+  >
+    <el-option
+      v-for="brand in filteredList"
+      :key="brand.id!"
+      :label="brand.name"
+      :value="brand.id!"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { ItemBrandApi, ItemBrandVO } from '@/api/wms/md/item/brand'
+
+/** WMS 商品品牌选择器 */
+defineOptions({ name: 'WmsItemBrandSelect', inheritAttrs: false })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择商品品牌'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [brand: ItemBrandVO | undefined]
+}>()
+
+const brandList = ref<ItemBrandVO[]>([]) // 品牌列表
+const filteredList = ref<ItemBrandVO[]>([]) // 过滤后的品牌列表
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+})
+
+/** 前端过滤 */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = brandList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = brandList.value.filter((brand) =>
+    brand.name?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (value: number | undefined) => {
+  emit(
+    'change',
+    brandList.value.find((brand) => brand.id === value)
+  )
+}
+
+/** 初始化 */
+onMounted(async () => {
+  brandList.value = await ItemBrandApi.getItemBrandSimpleList()
+  filteredList.value = brandList.value
+})
+</script>
diff --git a/src/views/wms/md/item/category/ItemCategoryForm.vue b/src/views/wms/md/item/category/ItemCategoryForm.vue
index 443f4de21..030ab7ea1 100644
--- a/src/views/wms/md/item/category/ItemCategoryForm.vue
+++ b/src/views/wms/md/item/category/ItemCategoryForm.vue
@@ -23,7 +23,12 @@
         <el-input v-model="formData.name" placeholder="请输入分类名称" />
       </el-form-item>
       <el-form-item label="显示排序" prop="sort">
-        <el-input-number v-model="formData.sort" :min="0" class="!w-1/1" controls-position="right" />
+        <el-input-number
+          v-model="formData.sort"
+          :min="0"
+          class="!w-1/1"
+          controls-position="right"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="formData.status" clearable placeholder="请选择状态">
diff --git a/src/views/wms/md/item/category/components/ItemCategorySelect.vue b/src/views/wms/md/item/category/components/ItemCategorySelect.vue
new file mode 100644
index 000000000..5df2a5f1e
--- /dev/null
+++ b/src/views/wms/md/item/category/components/ItemCategorySelect.vue
@@ -0,0 +1,57 @@
+<!-- WMS 商品分类选择器 -->
+<template>
+  <el-tree-select
+    v-bind="$attrs"
+    v-model="selectValue"
+    :data="categoryTree"
+    :disabled="disabled"
+    :props="defaultProps"
+    check-strictly
+    class="w-1/1"
+    default-expand-all
+    :placeholder="placeholder"
+    value-key="id"
+  />
+</template>
+
+<script lang="ts" setup>
+import { defaultProps, handleTree } from '@/utils/tree'
+import { ItemCategoryApi, ItemCategoryVO } from '@/api/wms/md/item/category'
+
+/** WMS 商品分类选择器 */
+defineOptions({ name: 'WmsItemCategorySelect', inheritAttrs: false })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    placeholder: '请选择商品分类'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+}>()
+
+const categoryTree = ref<ItemCategoryVO[]>([]) // 分类树
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+})
+
+/** 获得分类树 */
+const getCategoryTree = async () => {
+  const data = await ItemCategoryApi.getItemCategorySimpleList()
+  categoryTree.value = handleTree(data, 'id', 'parentId')
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getCategoryTree()
+})
+</script>
diff --git a/src/views/wms/md/item/category/components/ItemCategoryTree.vue b/src/views/wms/md/item/category/components/ItemCategoryTree.vue
new file mode 100644
index 000000000..53a00182a
--- /dev/null
+++ b/src/views/wms/md/item/category/components/ItemCategoryTree.vue
@@ -0,0 +1,100 @@
+<!-- WMS 商品分类树组件 -->
+<template>
+  <div class="h-full">
+    <el-input v-model="filterText" class="p-[15px]" clearable :placeholder="filterPlaceholder">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+    <el-scrollbar class="!h-[calc(100%-32px-30px)]">
+      <el-tree
+        ref="treeRef"
+        :data="categoryList"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :props="defaultProps"
+        default-expand-all
+        highlight-current
+        node-key="id"
+        @node-click="handleNodeClick"
+      />
+    </el-scrollbar>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ElTree } from 'element-plus'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { ItemCategoryApi, ItemCategoryVO } from '@/api/wms/md/item/category'
+
+/** WMS 商品分类树组件 */
+defineOptions({ name: 'WmsItemCategoryTree' })
+
+withDefaults(
+  defineProps<{
+    filterPlaceholder?: string // 搜索输入框占位文字
+  }>(),
+  {
+    filterPlaceholder: '请输入分类名称'
+  }
+)
+
+const emit = defineEmits<{
+  'node-click': [categoryId: number | undefined]
+}>()
+
+const filterText = ref('') // 过滤关键字
+const categoryList = ref<ItemCategoryVO[]>([]) // 分类树数据
+const treeRef = ref<InstanceType<typeof ElTree>>() // 树 Ref
+let currentNodeId: number | null = null // 当前选中的节点 ID
+
+/** 加载分类树 */
+const loadTree = async () => {
+  const data = await ItemCategoryApi.getItemCategorySimpleList()
+  categoryList.value = handleTree(data, 'id', 'parentId')
+}
+
+/** 基于名字过滤 */
+const filterNode = (name: string, data: ItemCategoryVO) => {
+  if (!name) {
+    return true
+  }
+  return !!data.name?.includes(name)
+}
+
+/** 监听过滤关键字 */
+watch(filterText, (val) => {
+  treeRef.value?.filter(val)
+})
+
+/** 处理节点点击：支持点击同一节点取消选中 */
+const handleNodeClick = (row: ItemCategoryVO) => {
+  if (currentNodeId === row.id) {
+    treeRef.value?.setCurrentKey(undefined)
+    currentNodeId = null
+    emit('node-click', undefined)
+  } else {
+    currentNodeId = row.id!
+    emit('node-click', row.id)
+  }
+}
+
+/** 清空选中状态 */
+const reset = () => {
+  currentNodeId = null
+  filterText.value = ''
+  treeRef.value?.setCurrentKey(undefined)
+}
+
+/** 设置当前选中分类 */
+const setCurrent = (categoryId: number) => {
+  treeRef.value?.setCurrentKey(categoryId)
+}
+
+defineExpose({ reset, setCurrent })
+
+/** 初始化 */
+onMounted(async () => {
+  await loadTree()
+})
+</script>
diff --git a/src/views/wms/md/item/index.vue b/src/views/wms/md/item/index.vue
new file mode 100644
index 000000000..f87befa4d
--- /dev/null
+++ b/src/views/wms/md/item/index.vue
@@ -0,0 +1,312 @@
+<!-- WMS 商品管理 -->
+<template>
+  <el-row :gutter="20">
+    <el-col :span="4" :xs="24">
+      <ContentWrap class="h-1/1">
+        <ItemCategoryTree ref="categoryTreeRef" @node-click="handleCategoryNodeClick" />
+      </ContentWrap>
+    </el-col>
+    <el-col :span="20" :xs="24">
+      <!-- 搜索工作栏 -->
+      <ContentWrap>
+        <el-form
+          ref="queryFormRef"
+          :inline="true"
+          :model="queryParams"
+          class="-mb-15px"
+          label-width="68px"
+        >
+          <el-form-item label="商品编号" prop="code">
+            <el-input
+              v-model="queryParams.code"
+              class="!w-240px"
+              clearable
+              placeholder="请输入商品编号"
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="商品名称" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              class="!w-240px"
+              clearable
+              placeholder="请输入商品名称"
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="商品品牌" prop="brandId">
+            <ItemBrandSelect v-model="queryParams.brandId" class="!w-240px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="handleQuery">
+              <Icon class="mr-5px" icon="ep:search" />
+              搜索
+            </el-button>
+            <el-button @click="resetQuery">
+              <Icon class="mr-5px" icon="ep:refresh" />
+              重置
+            </el-button>
+            <el-button
+              v-hasPermi="['wms:item:create']"
+              plain
+              type="primary"
+              @click="openForm('create')"
+            >
+              <Icon class="mr-5px" icon="ep:plus" />
+              新增
+            </el-button>
+            <el-button
+              v-hasPermi="['wms:item:export']"
+              :loading="exportLoading"
+              plain
+              type="success"
+              @click="handleExport"
+            >
+              <Icon class="mr-5px" icon="ep:download" />
+              导出
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </ContentWrap>
+
+      <!-- 商品列表 -->
+      <ContentWrap>
+        <el-table
+          v-loading="loading"
+          :data="list"
+          :show-overflow-tooltip="true"
+          :span-method="spanMethod"
+        >
+          <el-table-column label="商品信息" min-width="220">
+            <template #default="scope">
+              <div class="text-14px">{{ scope.row.itemName }}</div>
+              <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+                {{ scope.row.itemCode }}
+              </div>
+              <div v-if="scope.row.brandName" class="text-12px text-gray-500">
+                品牌：{{ scope.row.brandName }}
+              </div>
+              <div v-if="scope.row.categoryName" class="text-12px text-gray-500">
+                分类：{{ scope.row.categoryName }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格信息" min-width="180">
+            <template #default="scope">
+              <div class="text-14px">{{ scope.row.name }}</div>
+              <div v-if="scope.row.code" class="text-12px text-gray-500"
+                >编号：{{ scope.row.code }}</div
+              >
+              <div v-if="scope.row.barCode" class="text-12px text-gray-500">
+                条码：{{ scope.row.barCode }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="金额(元)" min-width="140">
+            <template #default="scope">
+              <div v-if="hasValue(scope.row.costPrice)">
+                成本价：{{ formatPrice(scope.row.costPrice) }}
+              </div>
+              <div v-if="hasValue(scope.row.sellingPrice)">
+                销售价：{{ formatPrice(scope.row.sellingPrice) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="重量(kg)" min-width="140">
+            <template #default="scope">
+              <div v-if="hasValue(scope.row.netWeight)">
+                净重：{{ formatWeight(scope.row.netWeight) }}
+              </div>
+              <div v-if="hasValue(scope.row.grossWeight)">
+                毛重：{{ formatWeight(scope.row.grossWeight) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="长宽高(cm)" min-width="180">
+            <template #default="scope">
+              {{ formatDimensionText(scope.row.length, scope.row.width, scope.row.height) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" width="120">
+            <template #default="scope">
+              <el-button
+                v-hasPermi="['wms:item:update']"
+                link
+                type="primary"
+                @click="openForm('update', scope.row.itemId)"
+              >
+                修改
+              </el-button>
+              <el-button
+                v-hasPermi="['wms:item:delete']"
+                link
+                type="danger"
+                @click="handleDelete(scope.row.itemId, scope.row.itemName)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <Pagination
+          v-model:limit="queryParams.pageSize"
+          v-model:page="queryParams.pageNo"
+          :total="total"
+          @pagination="getList"
+        />
+      </ContentWrap>
+    </el-col>
+  </el-row>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ItemForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import download from '@/utils/download'
+import { ItemApi, ItemVO } from '@/api/wms/md/item'
+import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import ItemForm from './ItemForm.vue'
+import ItemCategoryTree from './category/components/ItemCategoryTree.vue'
+import ItemBrandSelect from './brand/components/ItemBrandSelect.vue'
+import { isNullOrUnDef } from '@/utils/is'
+import { formatDimensionText, formatPrice, formatWeight } from '@/views/wms/utils/format'
+
+/** WMS 商品管理 */
+defineOptions({ name: 'WmsItem' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ItemSkuVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive<{
+  pageNo: number
+  pageSize: number
+  code?: string
+  name?: string
+  categoryId?: number
+  brandId?: number
+}>({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  name: undefined,
+  categoryId: undefined,
+  brandId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const categoryTreeRef = ref() // 分类树
+const exportLoading = ref(false) // 导出的加载中
+const hasValue = (value?: number | string | null) => !isNullOrUnDef(value)
+
+/** 查询商品列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ItemApi.getItemPage(queryParams)
+    list.value = buildItemSkuRows(data.list || [])
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 展开商品 SKU 列表 */
+const buildItemSkuRows = (items: ItemVO[]) => {
+  return items.flatMap((item) => {
+    const skus = item.skus?.length ? item.skus : [{}]
+    return skus.map((sku) => ({
+      ...sku,
+      itemId: item.id,
+      itemCode: item.code,
+      itemName: item.name,
+      categoryId: item.categoryId,
+      categoryName: item.categoryName,
+      unit: item.unit,
+      brandId: item.brandId,
+      brandName: item.brandName
+    }))
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  categoryTreeRef.value?.reset()
+  queryParams.categoryId = undefined
+  handleQuery()
+}
+
+/** 分类树点击 */
+const handleCategoryNodeClick = (categoryId: number | undefined) => {
+  queryParams.categoryId = categoryId
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除商品 */
+const handleDelete = async (id: number, name?: string) => {
+  try {
+    // 删除的二次确认
+    await message.confirm('确认删除商品【' + name + '】吗？')
+    // 发起删除
+    await ItemApi.deleteItem(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemApi.exportItem(queryParams)
+    download.excel(data, '商品.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 合并商品维度的重复单元格 */
+const spanMethod = ({ rowIndex, columnIndex }: { rowIndex: number; columnIndex: number }) => {
+  if (![0, 5].includes(columnIndex)) {
+    return { rowspan: 1, colspan: 1 }
+  }
+  const row = list.value[rowIndex]
+  if (rowIndex > 0 && list.value[rowIndex - 1]?.itemId === row.itemId) {
+    return { rowspan: 0, colspan: 0 }
+  }
+  let rowspan = 1
+  for (let index = rowIndex + 1; index < list.value.length; index++) {
+    if (list.value[index]?.itemId !== row.itemId) {
+      break
+    }
+    rowspan++
+  }
+  return { rowspan, colspan: 1 }
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
diff --git a/src/views/wms/md/warehouse/WarehouseForm.vue b/src/views/wms/md/warehouse/WarehouseForm.vue
index 90b886d87..0d3f6e423 100644
--- a/src/views/wms/md/warehouse/WarehouseForm.vue
+++ b/src/views/wms/md/warehouse/WarehouseForm.vue
@@ -15,7 +15,12 @@
         <el-input v-model="formData.code" maxlength="20" placeholder="请输入仓库编号" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input-number v-model="formData.sort" :min="0" class="!w-1/1" controls-position="right" />
+        <el-input-number
+          v-model="formData.sort"
+          :min="0"
+          class="!w-1/1"
+          controls-position="right"
+        />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
diff --git a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
index 9714886f1..3d234c3ff 100644
--- a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
+++ b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
@@ -56,7 +56,9 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
 const selectableWarehouseList = computed(() =>
-  warehouseList.value.filter((warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id)
+  warehouseList.value.filter(
+    (warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id
+  )
 )
 const formData = ref<WarehouseAreaVO>({
   id: undefined,
diff --git a/src/views/wms/md/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
index 1c51fefc5..8ebb695fb 100644
--- a/src/views/wms/md/warehouse/area/index.vue
+++ b/src/views/wms/md/warehouse/area/index.vue
@@ -154,7 +154,9 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
 const selectableWarehouseList = computed(() =>
-  warehouseList.value.filter((warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id)
+  warehouseList.value.filter(
+    (warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id
+  )
 )
 
 /** 查询库区列表 */
diff --git a/src/views/wms/md/warehouse/index.vue b/src/views/wms/md/warehouse/index.vue
index 329f3caad..178443245 100644
--- a/src/views/wms/md/warehouse/index.vue
+++ b/src/views/wms/md/warehouse/index.vue
@@ -79,7 +79,9 @@
             v-if="AREA_ENABLE"
             :to="{ name: 'WmsWarehouseArea', params: { warehouseId: scope.row.id } }"
           >
-            <el-button v-hasPermi="['wms:warehouse-area:query']" link type="primary">库区</el-button>
+            <el-button v-hasPermi="['wms:warehouse-area:query']" link type="primary">
+              库区
+            </el-button>
           </router-link>
           <el-button
             v-hasPermi="['wms:warehouse:update']"
diff --git a/src/views/wms/utils/format.ts b/src/views/wms/utils/format.ts
new file mode 100644
index 000000000..5b955746e
--- /dev/null
+++ b/src/views/wms/utils/format.ts
@@ -0,0 +1,62 @@
+/**
+ * WMS 展示格式化和表单配置
+ */
+
+import { isNullOrUnDef } from '@/utils/is'
+
+/** 金额小数位 */
+export const PRICE_PRECISION = 2
+/** 重量小数位 */
+export const WEIGHT_PRECISION = 3
+/** 长宽高小数位 */
+export const DIMENSION_PRECISION = 1
+
+export const formatNumber = (
+  value?: number | string | null,
+  digit: number = PRICE_PRECISION
+) => {
+  if (isNullOrUnDef(value)) {
+    return ''
+  }
+  if (typeof value === 'string' && value.trim() === '') {
+    return ''
+  }
+  const numberValue = typeof value === 'string' ? Number(value) : value
+  if (!Number.isFinite(numberValue)) {
+    return ''
+  }
+  return numberValue.toFixed(digit)
+}
+
+/** 格式化金额，保留 2 位小数 */
+export const formatPrice = (value?: number | string | null) => {
+  return formatNumber(value, PRICE_PRECISION)
+}
+
+/** 格式化重量，保留 3 位小数 */
+export const formatWeight = (value?: number | string | null) => {
+  return formatNumber(value, WEIGHT_PRECISION)
+}
+
+/** 格式化长宽高，保留 1 位小数 */
+export const formatDimension = (value?: number | string | null) => {
+  return formatNumber(value, DIMENSION_PRECISION)
+}
+
+/** 格式化长宽高组合，保留 1 位小数 */
+export const formatDimensionText = (
+  length?: number | string | null,
+  width?: number | string | null,
+  height?: number | string | null
+) => {
+  if (!isNullOrUnDef(length) && !isNullOrUnDef(width) && !isNullOrUnDef(height)) {
+    return [formatDimension(length), formatDimension(width), formatDimension(height)].join(' * ')
+  }
+  return [
+    !isNullOrUnDef(length) ? `长：${formatDimension(length)}` : undefined,
+    !isNullOrUnDef(width) ? `宽：${formatDimension(width)}` : undefined,
+    !isNullOrUnDef(height) ? `高：${formatDimension(height)}` : undefined
+  ]
+    .filter(Boolean)
+    .join(' ')
+}

From 4da16e95f5a873760b1abfa0adbb7df21d59d4d1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 22:46:23 +0800
Subject: [PATCH 05/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E3=80=81?=
 =?UTF-8?q?SKU=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                  | 3 +++
 src/views/wms/md/item/ItemForm.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 91909f538..455c3d656 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -216,6 +216,9 @@ export enum DICT_TYPE {
   ERP_AUDIT_STATUS = 'erp_audit_status', // ERP 审批状态
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
 
+  // ========== WMS - 仓库管理模块 ==========
+  WMS_MERCHANT_TYPE = 'merchant_type', // WMS 供应商企业类型
+
   // ========== AI - 人工智能模块  ==========
   AI_PLATFORM = 'ai_platform', // AI 平台
   AI_MODEL_TYPE = 'ai_model_type', // AI 模型类型
diff --git a/src/views/wms/md/item/ItemForm.vue b/src/views/wms/md/item/ItemForm.vue
index d0b5aa5c6..79b78d646 100644
--- a/src/views/wms/md/item/ItemForm.vue
+++ b/src/views/wms/md/item/ItemForm.vue
@@ -35,7 +35,7 @@
             <ItemBrandSelect v-model="formData.brandId" />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" />
           </el-form-item>

From 711d5abc0aba33606d92332a26b82a55022b6fb8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 May 2026 23:56:28 +0800
Subject: [PATCH 06/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BE=80=E6=9D=A5=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/merchant/index.ts           |  57 ++++++
 src/utils/dict.ts                          |   2 +-
 src/views/wms/md/merchant/MerchantForm.vue | 185 ++++++++++++++++++
 src/views/wms/md/merchant/index.vue        | 211 +++++++++++++++++++++
 4 files changed, 454 insertions(+), 1 deletion(-)
 create mode 100644 src/api/wms/md/merchant/index.ts
 create mode 100644 src/views/wms/md/merchant/MerchantForm.vue
 create mode 100644 src/views/wms/md/merchant/index.vue

diff --git a/src/api/wms/md/merchant/index.ts b/src/api/wms/md/merchant/index.ts
new file mode 100644
index 000000000..7a552a29a
--- /dev/null
+++ b/src/api/wms/md/merchant/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+// WMS 往来企业 VO
+export interface MerchantVO {
+  id?: number
+  code?: string
+  name?: string
+  type?: number
+  level?: string
+  bankName?: string
+  bankAccount?: string
+  address?: string
+  mobile?: string
+  telephone?: string
+  contact?: string
+  email?: string
+  remark?: string
+  createTime?: Date
+}
+
+// WMS 往来企业 API
+export const MerchantApi = {
+  // 查询往来企业分页
+  getMerchantPage: async (params: any) => {
+    return await request.get({ url: '/wms/merchant/page', params })
+  },
+
+  // 查询往来企业精简列表
+  getMerchantSimpleList: async (params?: any) => {
+    return await request.get({ url: '/wms/merchant/simple-list', params })
+  },
+
+  // 查询往来企业详情
+  getMerchant: async (id: number) => {
+    return await request.get({ url: '/wms/merchant/get?id=' + id })
+  },
+
+  // 新增往来企业
+  createMerchant: async (data: MerchantVO) => {
+    return await request.post({ url: '/wms/merchant/create', data })
+  },
+
+  // 修改往来企业
+  updateMerchant: async (data: MerchantVO) => {
+    return await request.put({ url: '/wms/merchant/update', data })
+  },
+
+  // 删除往来企业
+  deleteMerchant: async (id: number) => {
+    return await request.delete({ url: '/wms/merchant/delete?id=' + id })
+  },
+
+  // 导出往来企业
+  exportMerchant: async (params: any) => {
+    return await request.download({ url: '/wms/merchant/export-excel', params })
+  }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 455c3d656..130c239ab 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -217,7 +217,7 @@ export enum DICT_TYPE {
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
 
   // ========== WMS - 仓库管理模块 ==========
-  WMS_MERCHANT_TYPE = 'merchant_type', // WMS 供应商企业类型
+  WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
 
   // ========== AI - 人工智能模块  ==========
   AI_PLATFORM = 'ai_platform', // AI 平台
diff --git a/src/views/wms/md/merchant/MerchantForm.vue b/src/views/wms/md/merchant/MerchantForm.vue
new file mode 100644
index 000000000..6571f0066
--- /dev/null
+++ b/src/views/wms/md/merchant/MerchantForm.vue
@@ -0,0 +1,185 @@
+<!-- WMS 往来企业表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1000px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="往来企业编号" prop="code">
+            <el-input v-model="formData.code" maxlength="20" placeholder="请输入往来企业编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="往来企业名称" prop="name">
+            <el-input v-model="formData.name" maxlength="60" placeholder="请输入往来企业名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="往来企业类型" prop="type">
+            <el-select v-model="formData.type" class="w-1/1" placeholder="请选择往来企业类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.WMS_MERCHANT_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="级别" prop="level">
+            <el-input v-model="formData.level" maxlength="10" placeholder="请输入级别" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开户行" prop="bankName">
+            <el-input v-model="formData.bankName" maxlength="255" placeholder="请输入开户行" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="银行账户" prop="bankAccount">
+            <el-input v-model="formData.bankAccount" maxlength="40" placeholder="请输入银行账户" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="地址" prop="address">
+            <el-input v-model="formData.address" maxlength="200" placeholder="请输入地址" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="contact">
+            <el-input v-model="formData.contact" maxlength="30" placeholder="请输入联系人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机号" prop="mobile">
+            <el-input v-model="formData.mobile" maxlength="13" placeholder="请输入手机号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="座机号" prop="telephone">
+            <el-input v-model="formData.telephone" maxlength="13" placeholder="请输入座机号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="Email" prop="email">
+            <el-input v-model="formData.email" maxlength="50" placeholder="请输入 Email" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { MerchantApi, MerchantVO } from '@/api/wms/md/merchant'
+
+/** WMS 往来企业表单 */
+defineOptions({ name: 'WmsMerchantForm' })
+
+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 formData = ref<MerchantVO>({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  type: undefined,
+  level: undefined,
+  bankName: undefined,
+  bankAccount: undefined,
+  address: undefined,
+  mobile: undefined,
+  telephone: undefined,
+  contact: undefined,
+  email: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  code: [{ required: true, message: '往来企业编号不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '往来企业名称不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '往来企业类型不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await MerchantApi.getMerchant(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as MerchantVO
+    if (formType.value === 'create') {
+      await MerchantApi.createMerchant(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MerchantApi.updateMerchant(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    name: undefined,
+    type: undefined,
+    level: undefined,
+    bankName: undefined,
+    bankAccount: undefined,
+    address: undefined,
+    mobile: undefined,
+    telephone: undefined,
+    contact: undefined,
+    email: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/wms/md/merchant/index.vue b/src/views/wms/md/merchant/index.vue
new file mode 100644
index 000000000..5aa27392f
--- /dev/null
+++ b/src/views/wms/md/merchant/index.vue
@@ -0,0 +1,211 @@
+<!-- WMS 往来企业 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="120px"
+    >
+      <el-form-item label="往来企业编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入往来企业编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="往来企业名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入往来企业名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="往来企业类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          class="!w-240px"
+          clearable
+          placeholder="请选择往来企业类型"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_MERCHANT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:merchant:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:merchant:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 往来企业列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="往来企业编号" prop="code" width="160" />
+      <el-table-column align="center" label="往来企业名称" prop="name" min-width="160" />
+      <el-table-column align="center" label="往来企业类型" prop="type" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_MERCHANT_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="级别" prop="level" width="100" />
+      <el-table-column align="center" label="联系人" prop="contact" width="120" />
+      <el-table-column align="center" label="备注" prop="remark" min-width="160" />
+      <el-table-column align="center" label="操作" width="160">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['wms:merchant:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:merchant:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MerchantForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { MerchantApi, MerchantVO } from '@/api/wms/md/merchant'
+import MerchantForm from './MerchantForm.vue'
+import download from '@/utils/download'
+
+/** WMS 往来企业 */
+defineOptions({ name: 'WmsMerchant' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<MerchantVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  name: undefined,
+  type: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询往来企业列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MerchantApi.getMerchantPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除往来企业 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MerchantApi.deleteMerchant(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MerchantApi.exportMerchant(queryParams)
+    download.excel(data, '往来企业.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>

From 32442830b0606edc99944efa0cd989af716a7a67 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 May 2026 09:45:24 +0800
Subject: [PATCH 07/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20inventory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |   1 +
 src/views/wms/inventory/statistics/index.vue  | 342 ++++++++++++++++++
 .../md/warehouse/area/WarehouseAreaForm.vue   |  23 +-
 src/views/wms/md/warehouse/area/index.vue     |  17 +-
 .../components/WarehouseAreaSelect.vue        |  83 +++++
 .../warehouse/components/WarehouseSelect.vue  |  81 +++++
 6 files changed, 512 insertions(+), 35 deletions(-)
 create mode 100644 src/views/wms/inventory/statistics/index.vue
 create mode 100644 src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
 create mode 100644 src/views/wms/md/warehouse/components/WarehouseSelect.vue

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 130c239ab..6334cae2b 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -218,6 +218,7 @@ export enum DICT_TYPE {
 
   // ========== WMS - 仓库管理模块 ==========
   WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
+  WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型
 
   // ========== AI - 人工智能模块  ==========
   AI_PLATFORM = 'ai_platform', // AI 平台
diff --git a/src/views/wms/inventory/statistics/index.vue b/src/views/wms/inventory/statistics/index.vue
new file mode 100644
index 000000000..f5aa31026
--- /dev/null
+++ b/src/views/wms/inventory/statistics/index.vue
@@ -0,0 +1,342 @@
+<!-- WMS 库存统计 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="统计维度" prop="type">
+        <el-radio-group v-model="queryParams.type" class="!w-240px" @change="handleTypeChange">
+          <el-radio-button
+            v-for="item in dimensionOptions"
+            :key="item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          @change="handleWarehouseChange"
+        />
+      </el-form-item>
+      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
+        <WarehouseAreaSelect
+          v-model="queryParams.areaId"
+          :warehouse-id="queryParams.warehouseId"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="商品名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品编号" prop="itemCode">
+        <el-input
+          v-model="queryParams.itemCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格名称" prop="skuName">
+        <el-input
+          v-model="queryParams.skuName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格编号" prop="skuCode">
+        <el-input
+          v-model="queryParams.skuCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 库存列表 -->
+  <ContentWrap>
+    <div class="mb-12px flex items-center justify-between">
+      <span class="text-16px font-500">库存统计</span>
+      <el-checkbox v-model="filterZero" @change="handleFilterZeroChange">
+        过滤掉库存为0的商品
+      </el-checkbox>
+    </div>
+    <el-table
+      v-loading="loading"
+      :cell-class-name="'wms-inventory-statistics-cell'"
+      :data="list"
+      :show-overflow-tooltip="true"
+      :span-method="spanMethod"
+      border
+    >
+      <template v-if="warehouseDimensionList.includes(queryParams.type)">
+        <el-table-column label="仓库" min-width="160" prop="warehouseId">
+          <template #default="scope">
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="queryParams.type === INVENTORY_DIMENSION.AREA"
+          label="库区"
+          min-width="160"
+          prop="areaId"
+        >
+          <template #default="scope">
+            {{ scope.row.areaName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="商品信息"
+          min-width="240"
+          :prop="
+            queryParams.type === INVENTORY_DIMENSION.WAREHOUSE ? 'warehouseItemId' : 'areaItemId'
+          "
+        >
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220" prop="skuId">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+      </template>
+      <template v-else>
+        <el-table-column label="商品信息" min-width="240" prop="itemId">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220" prop="skuId">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库" min-width="160" prop="skuWarehouseId">
+          <template #default="scope">
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="所属库区" min-width="160" prop="areaId">
+          <template #default="scope">
+            {{ scope.row.areaName || '-' }}
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column align="right" label="库存" min-width="130" prop="quantity">
+        <template #default="scope">
+          {{ formatNumber(scope.row.quantity, 2) }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
+import { formatNumber } from '@/views/wms/utils/format'
+
+/** WMS 库存统计 */
+defineOptions({ name: 'WmsInventoryStatistics' })
+
+const INVENTORY_DIMENSION = {
+  WAREHOUSE: 'warehouse',
+  AREA: 'area',
+  ITEM: 'item'
+} as const
+type InventoryDimension = (typeof INVENTORY_DIMENSION)[keyof typeof INVENTORY_DIMENSION]
+
+const dimensionOptions = computed(() => [
+  { label: '仓库', value: INVENTORY_DIMENSION.WAREHOUSE },
+  ...(AREA_ENABLE ? [{ label: '库区', value: INVENTORY_DIMENSION.AREA }] : []),
+  { label: '商品', value: INVENTORY_DIMENSION.ITEM }
+])
+const warehouseDimensionList = [INVENTORY_DIMENSION.WAREHOUSE, INVENTORY_DIMENSION.AREA]
+
+interface InventoryRow extends InventoryVO {
+  warehouseItemId?: string
+  areaItemId?: string
+  skuWarehouseId?: string
+}
+
+interface SpanMethodProps {
+  column: {
+    property?: string
+  }
+  rowIndex: number
+}
+
+const loading = ref(true) // 列表的加载中
+const list = ref<InventoryRow[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const filterZero = ref(false) // 是否过滤库存为 0 的商品
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: INVENTORY_DIMENSION.WAREHOUSE as InventoryDimension,
+  itemCode: undefined as string | undefined,
+  itemName: undefined as string | undefined,
+  skuCode: undefined as string | undefined,
+  skuName: undefined as string | undefined,
+  warehouseId: undefined as number | undefined,
+  areaId: undefined as number | undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询库存列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await InventoryApi.getInventoryPage({
+      ...queryParams,
+      areaId: AREA_ENABLE ? queryParams.areaId : undefined,
+      minQuantity: filterZero.value ? 1 : undefined
+    })
+    list.value = data.list.map((item: InventoryVO) => ({
+      ...item,
+      // 展示字段
+      warehouseItemId: `${item.warehouseId || 0}-${item.itemId || 0}`,
+      areaItemId: `${item.areaId || 0}-${item.itemId || 0}`,
+      skuWarehouseId: `${item.skuId || 0}-${item.warehouseId || 0}`
+    }))
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  queryParams.type = INVENTORY_DIMENSION.WAREHOUSE
+  filterZero.value = false
+  handleQuery()
+}
+
+/** 统计维度变化 */
+const handleTypeChange = () => {
+  queryParams.pageNo = 1
+  if (queryParams.type === INVENTORY_DIMENSION.WAREHOUSE) {
+    queryParams.areaId = undefined
+  }
+  getList()
+}
+
+/** 是否过滤零库存变化 */
+const handleFilterZeroChange = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  queryParams.areaId = undefined
+}
+
+/** 合并库存统计的维度单元格 */
+const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
+  const property = column.property
+  if (!property || !getRowSpanProperties().includes(property)) {
+    return { rowspan: 1, colspan: 1 }
+  }
+  const row = list.value[rowIndex]
+  if (
+    rowIndex > 0 &&
+    getRowPropertyValue(list.value[rowIndex - 1], property) === getRowPropertyValue(row, property)
+  ) {
+    return { rowspan: 0, colspan: 0 }
+  }
+  let rowspan = 1
+  for (let index = rowIndex + 1; index < list.value.length; index++) {
+    if (getRowPropertyValue(list.value[index], property) !== getRowPropertyValue(row, property)) {
+      break
+    }
+    rowspan++
+  }
+  return { rowspan, colspan: 1 }
+}
+
+const getRowPropertyValue = (row: InventoryRow | undefined, property: string) => {
+  return row?.[property as keyof InventoryRow]
+}
+
+const getRowSpanProperties = () => {
+  if (queryParams.type === INVENTORY_DIMENSION.ITEM) {
+    return ['itemId', 'skuId', 'skuWarehouseId']
+  }
+  if (queryParams.type === INVENTORY_DIMENSION.AREA) {
+    return ['warehouseId', 'areaId', 'areaItemId']
+  }
+  return ['warehouseId', 'warehouseItemId']
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style scoped>
+:deep(.wms-inventory-statistics-cell) {
+  vertical-align: top;
+}
+</style>
diff --git a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
index 3d234c3ff..5b1e12185 100644
--- a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
+++ b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
@@ -9,14 +9,7 @@
       label-width="100px"
     >
       <el-form-item label="所属仓库" prop="warehouseId">
-        <el-select v-model="formData.warehouseId" class="!w-1/1" placeholder="请选择所属仓库">
-          <el-option
-            v-for="warehouse in selectableWarehouseList"
-            :key="warehouse.id"
-            :label="warehouse.name"
-            :value="warehouse.id"
-          />
-        </el-select>
+        <WarehouseSelect v-model="formData.warehouseId" placeholder="请选择所属仓库" />
       </el-form-item>
       <el-form-item label="库区名称" prop="name">
         <el-input v-model="formData.name" maxlength="60" placeholder="请输入库区名称" />
@@ -41,8 +34,8 @@
 </template>
 
 <script lang="ts" setup>
-import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 
 /** WMS 库区表单 */
 defineOptions({ name: 'WmsWarehouseAreaForm' })
@@ -54,12 +47,6 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
-const selectableWarehouseList = computed(() =>
-  warehouseList.value.filter(
-    (warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id
-  )
-)
 const formData = ref<WarehouseAreaVO>({
   id: undefined,
   code: undefined,
@@ -80,7 +67,6 @@ const open = async (type: string, id?: number, warehouseId?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  await getWarehouseList()
   if (warehouseId) {
     formData.value.warehouseId = warehouseId
   }
@@ -96,11 +82,6 @@ const open = async (type: string, id?: number, warehouseId?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-/** 查询仓库精简列表 */
-const getWarehouseList = async () => {
-  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
-}
-
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
diff --git a/src/views/wms/md/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
index 8ebb695fb..d0d7921ba 100644
--- a/src/views/wms/md/warehouse/area/index.vue
+++ b/src/views/wms/md/warehouse/area/index.vue
@@ -10,19 +10,12 @@
       label-width="68px"
     >
       <el-form-item label="所属仓库" prop="warehouseId">
-        <el-select
+        <WarehouseSelect
           v-model="queryParams.warehouseId"
           class="!w-240px"
           placeholder="请选择所属仓库"
           @change="warehouseChange"
-        >
-          <el-option
-            v-for="warehouse in selectableWarehouseList"
-            :key="warehouse.id"
-            :label="warehouse.name"
-            :value="warehouse.id"
-          />
-        </el-select>
+        />
       </el-form-item>
       <el-form-item label="库区名称" prop="name">
         <el-input
@@ -131,6 +124,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
 import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
 import WarehouseAreaForm from './WarehouseAreaForm.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import download from '@/utils/download'
 
 /** WMS 库区管理 */
@@ -153,11 +147,6 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
-const selectableWarehouseList = computed(() =>
-  warehouseList.value.filter(
-    (warehouse): warehouse is WarehouseVO & { id: number } => !!warehouse.id
-  )
-)
 
 /** 查询库区列表 */
 const getList = async () => {
diff --git a/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue b/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
new file mode 100644
index 000000000..a7035459c
--- /dev/null
+++ b/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
@@ -0,0 +1,83 @@
+<!-- WMS 库区选择器 -->
+<template>
+  <el-select
+    v-bind="$attrs"
+    v-model="selectValue"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filter-method="handleFilter"
+    :placeholder="placeholder"
+    class="w-1/1"
+    filterable
+    @change="handleChange"
+  >
+    <el-option v-for="area in filteredList" :key="area.id!" :label="area.name" :value="area.id!" />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
+
+/** WMS 库区选择器 */
+defineOptions({ name: 'WmsWarehouseAreaSelect', inheritAttrs: false })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    warehouseId?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择库区'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [area: WarehouseAreaVO | undefined]
+}>()
+
+const areaList = ref<WarehouseAreaVO[]>([]) // 库区列表
+const filteredList = ref<WarehouseAreaVO[]>([]) // 过滤后的库区列表
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+})
+
+/** 前端过滤 */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = areaList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = areaList.value.filter((area) => area.name?.toLowerCase().includes(keyword))
+}
+
+/** 选中变化 */
+const handleChange = (value: number | undefined) => {
+  emit(
+    'change',
+    areaList.value.find((area) => area.id === value)
+  )
+}
+
+/** 获得库区列表 */
+const getAreaList = async () => {
+  try {
+    areaList.value = await WarehouseAreaApi.getWarehouseAreaSimpleList(props.warehouseId)
+    filteredList.value = areaList.value
+  } catch {
+    areaList.value = []
+    filteredList.value = []
+  }
+}
+
+/** 监听仓库变化 */
+watch(() => props.warehouseId, getAreaList, { immediate: true })
+</script>
diff --git a/src/views/wms/md/warehouse/components/WarehouseSelect.vue b/src/views/wms/md/warehouse/components/WarehouseSelect.vue
new file mode 100644
index 000000000..b652ea596
--- /dev/null
+++ b/src/views/wms/md/warehouse/components/WarehouseSelect.vue
@@ -0,0 +1,81 @@
+<!-- WMS 仓库选择器 -->
+<template>
+  <el-select
+    v-bind="$attrs"
+    v-model="selectValue"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filter-method="handleFilter"
+    :placeholder="placeholder"
+    class="w-1/1"
+    filterable
+    @change="handleChange"
+  >
+    <el-option
+      v-for="warehouse in filteredList"
+      :key="warehouse.id!"
+      :label="warehouse.name"
+      :value="warehouse.id!"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
+
+/** WMS 仓库选择器 */
+defineOptions({ name: 'WmsWarehouseSelect', inheritAttrs: false })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择仓库'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [warehouse: WarehouseVO | undefined]
+}>()
+
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const filteredList = ref<WarehouseVO[]>([]) // 过滤后的仓库列表
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+})
+
+/** 前端过滤 */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = warehouseList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = warehouseList.value.filter((warehouse) =>
+    warehouse.name?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (value: number | undefined) => {
+  emit(
+    'change',
+    warehouseList.value.find((warehouse) => warehouse.id === value)
+  )
+}
+
+/** 初始化 */
+onMounted(async () => {
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  filteredList.value = warehouseList.value
+})
+</script>

From 32bbd912a2573bdc11c0003c8519d3be456e85ea Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 May 2026 13:07:35 +0800
Subject: [PATCH 08/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20inventory=20history?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/detail/index.ts         |  36 ++
 src/api/wms/inventory/history/index.ts        |  37 ++
 src/api/wms/inventory/index.ts                |  28 ++
 src/views/wms/inventory/detail/index.vue      | 374 ++++++++++++++++++
 src/views/wms/inventory/history/index.vue     | 281 +++++++++++++
 .../inventory/{statistics => index}/index.vue |  11 +-
 6 files changed, 763 insertions(+), 4 deletions(-)
 create mode 100644 src/api/wms/inventory/detail/index.ts
 create mode 100644 src/api/wms/inventory/history/index.ts
 create mode 100644 src/api/wms/inventory/index.ts
 create mode 100644 src/views/wms/inventory/detail/index.vue
 create mode 100644 src/views/wms/inventory/history/index.vue
 rename src/views/wms/inventory/{statistics => index}/index.vue (97%)

diff --git a/src/api/wms/inventory/detail/index.ts b/src/api/wms/inventory/detail/index.ts
new file mode 100644
index 000000000..d34dc613a
--- /dev/null
+++ b/src/api/wms/inventory/detail/index.ts
@@ -0,0 +1,36 @@
+import request from '@/config/axios'
+
+// WMS 库存明细 VO
+export interface InventoryDetailVO {
+  id?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  quantity?: number
+  remainQuantity?: number
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  amount?: number
+  remark?: string
+  orderId?: number
+  orderNo?: string
+  orderType?: number
+  createTime?: Date
+}
+
+// WMS 库存明细 API
+export const InventoryDetailApi = {
+  // 查询库存明细分页
+  getInventoryDetailPage: async (params: any) => {
+    return await request.get({ url: '/wms/inventory-detail/page', params })
+  }
+}
diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
new file mode 100644
index 000000000..c2db7d786
--- /dev/null
+++ b/src/api/wms/inventory/history/index.ts
@@ -0,0 +1,37 @@
+import request from '@/config/axios'
+
+// WMS 库存记录 VO
+export interface InventoryHistoryVO {
+  id?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  quantity?: number
+  beforeQuantity?: number
+  afterQuantity?: number
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  amount?: number
+  remark?: string
+  orderId?: number
+  orderNo?: string
+  orderType?: number
+  createTime?: Date
+}
+
+// WMS 库存记录 API
+export const InventoryHistoryApi = {
+  // 查询库存记录分页
+  getInventoryHistoryPage: async (params: any) => {
+    return await request.get({ url: '/wms/inventory-history/page', params })
+  }
+}
diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts
new file mode 100644
index 000000000..3f8d65a6d
--- /dev/null
+++ b/src/api/wms/inventory/index.ts
@@ -0,0 +1,28 @@
+import request from '@/config/axios'
+
+// WMS 库存统计 VO
+export interface InventoryVO {
+  id?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  quantity?: number
+  remark?: string
+  createTime?: Date
+}
+
+// WMS 库存统计 API
+export const InventoryApi = {
+  // 查询库存统计分页
+  getInventoryPage: async (params: any) => {
+    return await request.get({ url: '/wms/inventory/page', params })
+  }
+}
diff --git a/src/views/wms/inventory/detail/index.vue b/src/views/wms/inventory/detail/index.vue
new file mode 100644
index 000000000..bee68a602
--- /dev/null
+++ b/src/views/wms/inventory/detail/index.vue
@@ -0,0 +1,374 @@
+<!-- WMS 库存明细 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="统计维度" prop="type">
+        <el-radio-group v-model="queryParams.type" class="!w-240px" @change="handleTypeChange">
+          <el-radio-button
+            v-for="item in detailDimensionOptions"
+            :key="item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="商品编号" prop="itemCode">
+        <el-input
+          v-model="queryParams.itemCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          @change="handleWarehouseChange"
+        />
+      </el-form-item>
+      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
+        <WarehouseAreaSelect
+          v-model="queryParams.areaId"
+          :warehouse-id="queryParams.warehouseId"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="规格编号" prop="skuCode">
+        <el-input
+          v-model="queryParams.skuCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格名称" prop="skuName">
+        <el-input
+          v-model="queryParams.skuName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="BATCH_ENABLE" label="批号" prop="batchNo">
+        <el-input
+          v-model="queryParams.batchNo"
+          class="!w-240px"
+          clearable
+          placeholder="请输入批号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="BATCH_ENABLE" label="过期日期" prop="expirationDate">
+        <el-date-picker
+          v-model="queryParams.expirationDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 库存明细列表 -->
+  <ContentWrap>
+    <div class="mb-12px text-16px font-500">库存明细</div>
+    <el-table
+      v-loading="loading"
+      :cell-class-name="'wms-inventory-detail-cell'"
+      :data="list"
+      :show-overflow-tooltip="true"
+      :span-method="spanMethod"
+      border
+    >
+      <template v-if="queryParams.type === INVENTORY_DETAIL_DIMENSION.WAREHOUSE">
+        <el-table-column label="仓库" min-width="160" prop="warehouseId">
+          <template #default="scope">
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="160" prop="areaId">
+          <template #default="scope">
+            {{ scope.row.areaName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="商品信息"
+          min-width="240"
+          :prop="AREA_ENABLE ? 'areaItemId' : 'warehouseItemId'"
+        >
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="规格信息"
+          min-width="220"
+          :prop="AREA_ENABLE ? 'areaSkuId' : 'warehouseSkuId'"
+        >
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+      </template>
+      <template v-else>
+        <el-table-column label="商品信息" min-width="240" prop="itemId">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220" prop="skuId">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库" min-width="160" prop="skuWarehouseId">
+          <template #default="scope">
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="所属库区" min-width="160" prop="skuAreaId">
+          <template #default="scope">
+            {{ scope.row.areaName || '-' }}
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="入库日期"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="right" label="库存" min-width="120">
+        <template #default="scope">
+          {{ formatNumber(scope.row.remainQuantity, 2) }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="BATCH_ENABLE"
+        align="center"
+        label="批号"
+        min-width="140"
+        prop="batchNo"
+      />
+      <el-table-column
+        v-if="BATCH_ENABLE"
+        align="left"
+        label="生产日期/过期日期"
+        min-width="180"
+      >
+        <template #default="scope">
+          <div v-if="scope.row.productionDate">
+            生产日期：{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
+          </div>
+          <div v-if="scope.row.expirationDate">
+            过期日期：{{ formatDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime'
+import { InventoryDetailApi, InventoryDetailVO } from '@/api/wms/inventory/detail'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatNumber } from '@/views/wms/utils/format'
+
+/** WMS 库存明细 */
+defineOptions({ name: 'WmsInventoryDetail' })
+
+const INVENTORY_DETAIL_DIMENSION = {
+  WAREHOUSE: 'warehouse',
+  ITEM: 'item'
+} as const
+type InventoryDetailDimension =
+  (typeof INVENTORY_DETAIL_DIMENSION)[keyof typeof INVENTORY_DETAIL_DIMENSION]
+
+const detailDimensionOptions = [
+  { label: '仓库库区', value: INVENTORY_DETAIL_DIMENSION.WAREHOUSE },
+  { label: '商品', value: INVENTORY_DETAIL_DIMENSION.ITEM }
+]
+
+interface InventoryDetailRow extends InventoryDetailVO {
+  warehouseItemId?: string
+  warehouseSkuId?: string
+  areaItemId?: string
+  areaSkuId?: string
+  skuWarehouseId?: string
+  skuAreaId?: string
+}
+
+interface SpanMethodProps {
+  column: {
+    property?: string
+  }
+  rowIndex: number
+}
+
+const loading = ref(true) // 列表的加载中
+const list = ref<InventoryDetailRow[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: INVENTORY_DETAIL_DIMENSION.WAREHOUSE as InventoryDetailDimension,
+  itemCode: undefined as string | undefined,
+  itemName: undefined as string | undefined,
+  skuCode: undefined as string | undefined,
+  skuName: undefined as string | undefined,
+  warehouseId: undefined as number | undefined,
+  areaId: undefined as number | undefined,
+  batchNo: undefined as string | undefined,
+  expirationDate: undefined as string[] | undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询库存明细列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await InventoryDetailApi.getInventoryDetailPage(queryParams)
+    list.value = data.list.map((item: InventoryDetailVO) => ({
+      ...item,
+      // 展示字段
+      warehouseItemId: `${item.warehouseId || 0}-${item.itemId || 0}`,
+      warehouseSkuId: `${item.warehouseId || 0}-${item.skuId || 0}`,
+      areaItemId: `${item.warehouseId || 0}-${item.areaId || 0}-${item.itemId || 0}`,
+      areaSkuId: `${item.warehouseId || 0}-${item.areaId || 0}-${item.skuId || 0}`,
+      skuWarehouseId: `${item.skuId || 0}-${item.warehouseId || 0}`,
+      skuAreaId: `${item.skuId || 0}-${item.warehouseId || 0}-${item.areaId || 0}`
+    }))
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  queryParams.type = INVENTORY_DETAIL_DIMENSION.WAREHOUSE
+  handleQuery()
+}
+
+/** 统计维度变化 */
+const handleTypeChange = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  queryParams.areaId = undefined
+}
+
+/** 合并库存明细的维度单元格 */
+const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
+  const property = column.property
+  if (!property || !getRowSpanProperties().includes(property)) {
+    return { rowspan: 1, colspan: 1 }
+  }
+  const row = list.value[rowIndex]
+  if (
+    rowIndex > 0 &&
+    getRowPropertyValue(list.value[rowIndex - 1], property) === getRowPropertyValue(row, property)
+  ) {
+    return { rowspan: 0, colspan: 0 }
+  }
+  let rowspan = 1
+  for (let index = rowIndex + 1; index < list.value.length; index++) {
+    if (getRowPropertyValue(list.value[index], property) !== getRowPropertyValue(row, property)) {
+      break
+    }
+    rowspan++
+  }
+  return { rowspan, colspan: 1 }
+}
+
+const getRowPropertyValue = (row: InventoryDetailRow | undefined, property: string) => {
+  return row?.[property as keyof InventoryDetailRow]
+}
+
+const getRowSpanProperties = () => {
+  if (queryParams.type === INVENTORY_DETAIL_DIMENSION.ITEM) {
+    return ['itemId', 'skuId', 'skuWarehouseId', 'skuAreaId']
+  }
+  return AREA_ENABLE
+    ? ['warehouseId', 'areaId', 'areaItemId', 'areaSkuId']
+    : ['warehouseId', 'warehouseItemId', 'warehouseSkuId']
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style scoped>
+:deep(.wms-inventory-detail-cell) {
+  vertical-align: top;
+}
+</style>
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
new file mode 100644
index 000000000..e408b324d
--- /dev/null
+++ b/src/views/wms/inventory/history/index.vue
@@ -0,0 +1,281 @@
+<!-- WMS 库存流水 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="操作类型" prop="orderType">
+        <el-select
+          v-model="queryParams.orderType"
+          class="!w-240px"
+          clearable
+          placeholder="请选择操作类型"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_INVENTORY_HISTORY_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          class="!w-240px"
+          clearable
+          placeholder="请输入操作单号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          @change="handleWarehouseChange"
+        />
+      </el-form-item>
+      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
+        <WarehouseAreaSelect
+          v-model="queryParams.areaId"
+          :warehouse-id="queryParams.warehouseId"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="商品编号" prop="itemCode">
+        <el-input
+          v-model="queryParams.itemCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入商品名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格编号" prop="skuCode">
+        <el-input
+          v-model="queryParams.skuCode"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格名称" prop="skuName">
+        <el-input
+          v-model="queryParams.skuName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入规格名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 库存流水列表 -->
+  <ContentWrap>
+    <div class="mb-12px text-16px font-500">库存流水</div>
+    <el-table
+      v-loading="loading"
+      :cell-class-name="'wms-inventory-history-cell'"
+      :data="list"
+      :show-overflow-tooltip="true"
+      border
+    >
+      <el-table-column fixed="left" label="操作单号" prop="orderNo" width="180" />
+      <el-table-column align="center" fixed="left" label="操作类型" width="110">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_INVENTORY_HISTORY_TYPE" :value="scope.row.orderType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="商品信息" min-width="220">
+        <template #default="scope">
+          <div class="text-14px">{{ scope.row.itemName || '-' }}</div>
+          <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+            商品编号：{{ scope.row.itemCode }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="规格信息" min-width="180">
+        <template #default="scope">
+          <div class="text-14px">{{ scope.row.skuName || '-' }}</div>
+          <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+            规格编号：{{ scope.row.skuCode }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="AREA_ENABLE ? '仓库/库区' : '仓库'" min-width="160">
+        <template #default="scope">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
+            <div>库区：{{ scope.row.areaName || '-' }}</div>
+          </template>
+          <template v-else>
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作前" min-width="110">
+        <template #default="scope">
+          {{ formatNumber(scope.row.beforeQuantity, 2) || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作后" min-width="110">
+        <template #default="scope">
+          {{ formatNumber(scope.row.afterQuantity, 2) || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="数量/金额(元)" min-width="150">
+        <template #default="scope">
+          <div class="flex justify-between">
+            <span>数量：</span>
+            <span>{{ formatNumber(scope.row.quantity, 2) }}</span>
+          </div>
+          <div v-if="scope.row.amount || scope.row.amount === 0" class="flex justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(scope.row.amount) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="BATCH_ENABLE"
+        align="center"
+        label="批号"
+        min-width="140"
+        prop="batchNo"
+      />
+      <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+        <template #default="scope">
+          <div v-if="scope.row.productionDate">
+            生产日期：{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
+          </div>
+          <div v-if="scope.row.expirationDate">
+            过期日期：{{ formatDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        fixed="right"
+        label="操作时间"
+        prop="createTime"
+        width="180"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/history'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatNumber, formatPrice } from '@/views/wms/utils/format'
+
+/** WMS 库存流水 */
+defineOptions({ name: 'WmsInventoryHistory' })
+
+const loading = ref(true) // 列表的加载中
+const list = ref<InventoryHistoryVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  orderType: undefined as number | undefined,
+  orderNo: undefined as string | undefined,
+  itemCode: undefined as string | undefined,
+  itemName: undefined as string | undefined,
+  skuCode: undefined as string | undefined,
+  skuName: undefined as string | undefined,
+  warehouseId: undefined as number | undefined,
+  areaId: undefined as number | undefined,
+  createTime: undefined as string[] | undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询库存流水列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await InventoryHistoryApi.getInventoryHistoryPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  queryParams.areaId = undefined
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style scoped>
+:deep(.wms-inventory-history-cell) {
+  vertical-align: top;
+}
+</style>
diff --git a/src/views/wms/inventory/statistics/index.vue b/src/views/wms/inventory/index/index.vue
similarity index 97%
rename from src/views/wms/inventory/statistics/index.vue
rename to src/views/wms/inventory/index/index.vue
index f5aa31026..e5d24355b 100644
--- a/src/views/wms/inventory/statistics/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -93,7 +93,7 @@
     </div>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-inventory-statistics-cell'"
+      :cell-class-name="'wms-inventory-cell'"
       :data="list"
       :show-overflow-tooltip="true"
       :span-method="spanMethod"
@@ -190,7 +190,7 @@ import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatNumber } from '@/views/wms/utils/format'
 
 /** WMS 库存统计 */
-defineOptions({ name: 'WmsInventoryStatistics' })
+defineOptions({ name: 'WmsInventory' })
 
 const INVENTORY_DIMENSION = {
   WAREHOUSE: 'warehouse',
@@ -204,7 +204,10 @@ const dimensionOptions = computed(() => [
   ...(AREA_ENABLE ? [{ label: '库区', value: INVENTORY_DIMENSION.AREA }] : []),
   { label: '商品', value: INVENTORY_DIMENSION.ITEM }
 ])
-const warehouseDimensionList = [INVENTORY_DIMENSION.WAREHOUSE, INVENTORY_DIMENSION.AREA]
+const warehouseDimensionList: InventoryDimension[] = [
+  INVENTORY_DIMENSION.WAREHOUSE,
+  INVENTORY_DIMENSION.AREA
+]
 
 interface InventoryRow extends InventoryVO {
   warehouseItemId?: string
@@ -336,7 +339,7 @@ onMounted(async () => {
 </script>
 
 <style scoped>
-:deep(.wms-inventory-statistics-cell) {
+:deep(.wms-inventory-cell) {
   vertical-align: top;
 }
 </style>

From 314293ced3ba9f7fe2cab42a658b593ec6e3f3bc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 May 2026 14:10:16 +0800
Subject: [PATCH 09/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20inventory=20=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventory/index/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue
index e5d24355b..f70cfe56a 100644
--- a/src/views/wms/inventory/index/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -27,7 +27,7 @@
           @change="handleWarehouseChange"
         />
       </el-form-item>
-      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
+      <el-form-item v-if="isAreaQueryVisible" label="库区" prop="areaId">
         <WarehouseAreaSelect
           v-model="queryParams.areaId"
           :warehouse-id="queryParams.warehouseId"
@@ -245,7 +245,7 @@ const getList = async () => {
   try {
     const data = await InventoryApi.getInventoryPage({
       ...queryParams,
-      areaId: AREA_ENABLE ? queryParams.areaId : undefined,
+      areaId: isAreaQueryVisible.value ? queryParams.areaId : undefined,
       minQuantity: filterZero.value ? 1 : undefined
     })
     list.value = data.list.map((item: InventoryVO) => ({
@@ -295,6 +295,11 @@ const handleWarehouseChange = () => {
   queryParams.areaId = undefined
 }
 
+/** 是否展示库区搜索项 */
+const isAreaQueryVisible = computed(() => {
+  return AREA_ENABLE && queryParams.type !== INVENTORY_DIMENSION.WAREHOUSE
+})
+
 /** 合并库存统计的维度单元格 */
 const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
   const property = column.property

From f0cd6391370ac7ccbda3145b3e2a2709d30b2019 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 May 2026 15:11:39 +0800
Subject: [PATCH 10/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20inventory=20history?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventory/detail/index.vue | 34 +++++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventory/detail/index.vue b/src/views/wms/inventory/detail/index.vue
index bee68a602..52516f3bd 100644
--- a/src/views/wms/inventory/detail/index.vue
+++ b/src/views/wms/inventory/detail/index.vue
@@ -79,9 +79,25 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="BATCH_ENABLE" label="过期日期" prop="expirationDate">
+      <el-form-item v-if="BATCH_ENABLE" label="过期" prop="daysToExpires">
+        <el-select
+          v-model="queryParams.daysToExpires"
+          class="!w-240px"
+          clearable
+          placeholder="请选择过期时间"
+        >
+          <el-option
+            v-for="item in expirationDayOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="入库日期" prop="createTime">
         <el-date-picker
-          v-model="queryParams.expirationDate"
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           :shortcuts="defaultShortcuts"
           class="!w-240px"
           end-placeholder="结束日期"
@@ -187,7 +203,8 @@
       />
       <el-table-column align="right" label="库存" min-width="120">
         <template #default="scope">
-          {{ formatNumber(scope.row.remainQuantity, 2) }}
+          <div>剩余：{{ formatNumber(scope.row.remainQuantity, 2) }}</div>
+          <div class="text-12px text-gray-500">原始：{{ formatNumber(scope.row.quantity, 2) }}</div>
         </template>
       </el-table-column>
       <el-table-column
@@ -245,6 +262,14 @@ const detailDimensionOptions = [
   { label: '仓库库区', value: INVENTORY_DETAIL_DIMENSION.WAREHOUSE },
   { label: '商品', value: INVENTORY_DETAIL_DIMENSION.ITEM }
 ]
+const expirationDayOptions = [
+  { label: '30天内', value: 30 },
+  { label: '60天内', value: 60 },
+  { label: '90天内', value: 90 },
+  { label: '120天内', value: 120 },
+  { label: '180天内', value: 180 },
+  { label: '365天内', value: 365 }
+]
 
 interface InventoryDetailRow extends InventoryDetailVO {
   warehouseItemId?: string
@@ -276,7 +301,8 @@ const queryParams = reactive({
   warehouseId: undefined as number | undefined,
   areaId: undefined as number | undefined,
   batchNo: undefined as string | undefined,
-  expirationDate: undefined as string[] | undefined
+  daysToExpires: undefined as number | undefined,
+  createTime: [] as string[]
 })
 const queryFormRef = ref() // 搜索的表单
 

From 0be2674277bb68868d771ec08f3cb5721fe1b4d2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 May 2026 11:14:21 +0800
Subject: [PATCH 11/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20inv=20=E5=BA=93=E5=AD=98=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=8F=90=E4=BE=9B=E7=9B=B8=E5=85=B3=E5=8D=95=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/receipt/detail/index.ts | 23 ++++++++
 src/api/wms/order/receipt/index.ts        | 70 +++++++++++++++++++++++
 src/utils/dict.ts                         |  2 +
 3 files changed, 95 insertions(+)
 create mode 100644 src/api/wms/order/receipt/detail/index.ts
 create mode 100644 src/api/wms/order/receipt/index.ts

diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
new file mode 100644
index 000000000..7d6990a39
--- /dev/null
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -0,0 +1,23 @@
+// WMS 入库单明细 VO
+export interface ReceiptOrderDetailVO {
+  id?: number
+  orderId?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  quantity?: number
+  amount?: number
+  remark?: string
+  createTime?: Date
+}
diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts
new file mode 100644
index 000000000..6b2992ea5
--- /dev/null
+++ b/src/api/wms/order/receipt/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+import { ReceiptOrderDetailVO } from './detail'
+
+// WMS 入库单 VO
+export interface ReceiptOrderVO {
+  id?: number
+  no?: string
+  type?: number
+  status?: number
+  bizOrderNo?: string
+  merchantId?: number
+  merchantName?: string
+  remark?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  totalQuantity?: number
+  totalAmount?: number
+  details?: ReceiptOrderDetailVO[]
+  createTime?: Date
+  creator?: string
+  updateTime?: Date
+  updater?: string
+}
+
+// WMS 入库单 API
+export const ReceiptOrderApi = {
+  // 查询入库单分页
+  getReceiptOrderPage: async (params: any) => {
+    return await request.get({ url: '/wms/receipt-order/page', params })
+  },
+
+  // 查询入库单详情
+  getReceiptOrder: async (id: number) => {
+    return await request.get({ url: '/wms/receipt-order/get?id=' + id })
+  },
+
+  // 查询入库单明细
+  getReceiptOrderDetailListByOrderId: async (orderId: number) => {
+    return await request.get({
+      url: '/wms/receipt-order-detail/list-by-order-id?orderId=' + orderId
+    })
+  },
+
+  // 新增入库单
+  createReceiptOrder: async (data: ReceiptOrderVO) => {
+    return await request.post({ url: '/wms/receipt-order/create', data })
+  },
+
+  // 修改入库单
+  updateReceiptOrder: async (data: ReceiptOrderVO) => {
+    return await request.put({ url: '/wms/receipt-order/update', data })
+  },
+
+  // 完成入库
+  completeReceiptOrder: async (data: ReceiptOrderVO) => {
+    return await request.put({ url: '/wms/receipt-order/complete', data })
+  },
+
+  // 删除入库单
+  deleteReceiptOrder: async (id: number) => {
+    return await request.delete({ url: '/wms/receipt-order/delete?id=' + id })
+  },
+
+  // 导出入库单
+  exportReceiptOrder: async (params: any) => {
+    return await request.download({ url: '/wms/receipt-order/export-excel', params })
+  }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 6334cae2b..d549f0152 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -219,6 +219,8 @@ export enum DICT_TYPE {
   // ========== WMS - 仓库管理模块 ==========
   WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
   WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型
+  WMS_RECEIPT_ORDER_STATUS = 'wms_receipt_order_status', // WMS 入库单状态
+  WMS_RECEIPT_ORDER_TYPE = 'wms_receipt_order_type', // WMS 入库单类型
 
   // ========== AI - 人工智能模块  ==========
   AI_PLATFORM = 'ai_platform', // AI 平台

From c865dfe4882b1b1e4acd1a87987e3a66b5230e14 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 May 2026 23:02:46 +0800
Subject: [PATCH 12/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=90=8E=E7=AB=AF=E5=AE=9E=E7=8E=B0=EF=BC=88?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=20mes=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/receipt/index.ts        | 11 +++-
 src/utils/dict.ts                         |  2 +-
 src/views/wms/inventory/detail/index.vue  |  6 +-
 src/views/wms/inventory/history/index.vue |  8 +--
 src/views/wms/inventory/index/index.vue   |  4 +-
 src/views/wms/utils/constants.ts          | 19 ++++++
 src/views/wms/utils/format.ts             | 71 +++++++++++++++++------
 7 files changed, 92 insertions(+), 29 deletions(-)
 create mode 100644 src/views/wms/utils/constants.ts

diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts
index 6b2992ea5..3defe4216 100644
--- a/src/api/wms/order/receipt/index.ts
+++ b/src/api/wms/order/receipt/index.ts
@@ -20,8 +20,10 @@ export interface ReceiptOrderVO {
   details?: ReceiptOrderDetailVO[]
   createTime?: Date
   creator?: string
+  creatorName?: string
   updateTime?: Date
   updater?: string
+  updaterName?: string
 }
 
 // WMS 入库单 API
@@ -54,8 +56,13 @@ export const ReceiptOrderApi = {
   },
 
   // 完成入库
-  completeReceiptOrder: async (data: ReceiptOrderVO) => {
-    return await request.put({ url: '/wms/receipt-order/complete', data })
+  completeReceiptOrder: async (id: number) => {
+    return await request.put({ url: '/wms/receipt-order/complete?id=' + id })
+  },
+
+  // 作废入库单
+  cancelReceiptOrder: async (id: number) => {
+    return await request.put({ url: '/wms/receipt-order/cancel?id=' + id })
   },
 
   // 删除入库单
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index d549f0152..02d91adde 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -219,7 +219,7 @@ export enum DICT_TYPE {
   // ========== WMS - 仓库管理模块 ==========
   WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
   WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型
-  WMS_RECEIPT_ORDER_STATUS = 'wms_receipt_order_status', // WMS 入库单状态
+  WMS_ORDER_STATUS = 'wms_order_status', // WMS 单据状态
   WMS_RECEIPT_ORDER_TYPE = 'wms_receipt_order_type', // WMS 入库单类型
 
   // ========== AI - 人工智能模块  ==========
diff --git a/src/views/wms/inventory/detail/index.vue b/src/views/wms/inventory/detail/index.vue
index 52516f3bd..5df1470a7 100644
--- a/src/views/wms/inventory/detail/index.vue
+++ b/src/views/wms/inventory/detail/index.vue
@@ -203,8 +203,8 @@
       />
       <el-table-column align="right" label="库存" min-width="120">
         <template #default="scope">
-          <div>剩余：{{ formatNumber(scope.row.remainQuantity, 2) }}</div>
-          <div class="text-12px text-gray-500">原始：{{ formatNumber(scope.row.quantity, 2) }}</div>
+          <div>剩余：{{ formatQuantity(scope.row.remainQuantity) }}</div>
+          <div class="text-12px text-gray-500">原始：{{ formatQuantity(scope.row.quantity) }}</div>
         </template>
       </el-table-column>
       <el-table-column
@@ -246,7 +246,7 @@ import { InventoryDetailApi, InventoryDetailVO } from '@/api/wms/inventory/detai
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
-import { formatNumber } from '@/views/wms/utils/format'
+import { formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存明细 */
 defineOptions({ name: 'WmsInventoryDetail' })
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index e408b324d..8cd5fcbbc 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -153,19 +153,19 @@
       </el-table-column>
       <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作前" min-width="110">
         <template #default="scope">
-          {{ formatNumber(scope.row.beforeQuantity, 2) || '-' }}
+          {{ formatQuantity(scope.row.beforeQuantity) || '-' }}
         </template>
       </el-table-column>
       <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作后" min-width="110">
         <template #default="scope">
-          {{ formatNumber(scope.row.afterQuantity, 2) || '-' }}
+          {{ formatQuantity(scope.row.afterQuantity) || '-' }}
         </template>
       </el-table-column>
       <el-table-column label="数量/金额(元)" min-width="150">
         <template #default="scope">
           <div class="flex justify-between">
             <span>数量：</span>
-            <span>{{ formatNumber(scope.row.quantity, 2) }}</span>
+            <span>{{ formatQuantity(scope.row.quantity) }}</span>
           </div>
           <div v-if="scope.row.amount || scope.row.amount === 0" class="flex justify-between">
             <span>金额：</span>
@@ -216,7 +216,7 @@ import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/his
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
-import { formatNumber, formatPrice } from '@/views/wms/utils/format'
+import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存流水 */
 defineOptions({ name: 'WmsInventoryHistory' })
diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue
index f70cfe56a..4ff9416a3 100644
--- a/src/views/wms/inventory/index/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -168,7 +168,7 @@
       </template>
       <el-table-column align="right" label="库存" min-width="130" prop="quantity">
         <template #default="scope">
-          {{ formatNumber(scope.row.quantity, 2) }}
+          {{ formatQuantity(scope.row.quantity) }}
         </template>
       </el-table-column>
     </el-table>
@@ -187,7 +187,7 @@ import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { AREA_ENABLE } from '@/views/wms/utils/config'
-import { formatNumber } from '@/views/wms/utils/format'
+import { formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存统计 */
 defineOptions({ name: 'WmsInventory' })
diff --git a/src/views/wms/utils/constants.ts b/src/views/wms/utils/constants.ts
new file mode 100644
index 000000000..ff922ce07
--- /dev/null
+++ b/src/views/wms/utils/constants.ts
@@ -0,0 +1,19 @@
+/** 单据状态枚举 */
+export const OrderStatusEnum = {
+  PREPARE: 0, // 草稿
+  FINISHED: 4, // 已完成
+  CANCELED: 5 // 已作废
+} as const
+
+/** 往来企业类型枚举 */
+export const MerchantTypeEnum = {
+  CUSTOMER: 1, // 客户
+  SUPPLIER: 2, // 供应商
+  CUSTOMER_SUPPLIER: 3 // 客户/供应商
+} as const
+
+/** 供应商类型的往来企业 */
+export const SupplierMerchantTypeList = [
+  MerchantTypeEnum.SUPPLIER,
+  MerchantTypeEnum.CUSTOMER_SUPPLIER
+]
diff --git a/src/views/wms/utils/format.ts b/src/views/wms/utils/format.ts
index 5b955746e..4f2a3b338 100644
--- a/src/views/wms/utils/format.ts
+++ b/src/views/wms/utils/format.ts
@@ -4,6 +4,10 @@
 
 import { isNullOrUnDef } from '@/utils/is'
 
+type DecimalValue = number | string | null | undefined
+
+/** 数量小数位 */
+export const QUANTITY_PRECISION = 2
 /** 金额小数位 */
 export const PRICE_PRECISION = 2
 /** 重量小数位 */
@@ -11,39 +15,72 @@ export const WEIGHT_PRECISION = 3
 /** 长宽高小数位 */
 export const DIMENSION_PRECISION = 1
 
-export const formatNumber = (
-  value?: number | string | null,
-  digit: number = PRICE_PRECISION
-) => {
+const toFiniteDecimal = (value: DecimalValue) => {
   if (isNullOrUnDef(value)) {
-    return ''
+    return undefined
   }
   if (typeof value === 'string' && value.trim() === '') {
-    return ''
+    return undefined
   }
-  const numberValue = typeof value === 'string' ? Number(value) : value
-  if (!Number.isFinite(numberValue)) {
-    return ''
+  const decimalValue = typeof value === 'string' ? Number(value) : value
+  if (!Number.isFinite(decimalValue)) {
+    return undefined
   }
-  return numberValue.toFixed(digit)
+  return decimalValue
 }
 
-/** 格式化金额，保留 2 位小数 */
+const sumDecimal = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+  return list.reduce((sum, item) => {
+    const decimalValue = toFiniteDecimal(getter(item))
+    return decimalValue === undefined ? sum : sum + decimalValue
+  }, 0)
+}
+
+/** 格式化数量 */
+export const formatQuantity = (value?: number | string | null) => {
+  const decimalValue = toFiniteDecimal(value)
+  return decimalValue === undefined ? '' : decimalValue.toFixed(QUANTITY_PRECISION)
+}
+
+/** 格式化金额 */
 export const formatPrice = (value?: number | string | null) => {
-  return formatNumber(value, PRICE_PRECISION)
+  const decimalValue = toFiniteDecimal(value)
+  return decimalValue === undefined ? '' : decimalValue.toFixed(PRICE_PRECISION)
 }
 
-/** 格式化重量，保留 3 位小数 */
+/** 汇总数量 */
+export const sumQuantity = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+  return sumDecimal(list, getter)
+}
+
+/** 汇总金额 */
+export const sumPrice = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+  return sumDecimal(list, getter)
+}
+
+/** 格式化汇总数量 */
+export const formatSumQuantity = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+  return formatQuantity(sumQuantity(list, getter))
+}
+
+/** 格式化汇总金额 */
+export const formatSumPrice = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+  return formatPrice(sumPrice(list, getter))
+}
+
+/** 格式化重量 */
 export const formatWeight = (value?: number | string | null) => {
-  return formatNumber(value, WEIGHT_PRECISION)
+  const decimalValue = toFiniteDecimal(value)
+  return decimalValue === undefined ? '' : decimalValue.toFixed(WEIGHT_PRECISION)
 }
 
-/** 格式化长宽高，保留 1 位小数 */
+/** 格式化长宽高 */
 export const formatDimension = (value?: number | string | null) => {
-  return formatNumber(value, DIMENSION_PRECISION)
+  const decimalValue = toFiniteDecimal(value)
+  return decimalValue === undefined ? '' : decimalValue.toFixed(DIMENSION_PRECISION)
 }
 
-/** 格式化长宽高组合，保留 1 位小数 */
+/** 格式化长宽高组合 */
 export const formatDimensionText = (
   length?: number | string | null,
   width?: number | string | null,

From 3ef4e8424fe1958b6a49437223320f413e4015f6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 May 2026 23:30:06 +0800
Subject: [PATCH 13/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/receipt/ReceiptOrderDetail.vue  | 173 +++++
 .../wms/order/receipt/ReceiptOrderPrint.vue   | 133 ++++
 src/views/wms/order/receipt/index.vue         | 613 ++++++++++++++++++
 3 files changed, 919 insertions(+)
 create mode 100644 src/views/wms/order/receipt/ReceiptOrderDetail.vue
 create mode 100644 src/views/wms/order/receipt/ReceiptOrderPrint.vue
 create mode 100644 src/views/wms/order/receipt/index.vue

diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
new file mode 100644
index 000000000..fee28e295
--- /dev/null
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -0,0 +1,173 @@
+<!-- WMS 入库单详情 -->
+<template>
+  <Dialog v-model="dialogVisible" title="入库单详情" width="1200px">
+    <div v-loading="loading">
+      <div class="mb-16px text-18px font-bold">单据信息</div>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="入库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="入库类型">
+          <dict-tag
+            v-if="detailData.type !== undefined"
+            :type="DICT_TYPE.WMS_RECEIPT_ORDER_TYPE"
+            :value="detailData.type"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="仓库">
+          {{ detailData.warehouseName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="供应商">
+          {{ detailData.merchantName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="业务单号">
+          {{ detailData.bizOrderNo || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="AREA_ENABLE" label="库区">
+          {{ detailData.areaName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总数量">
+          {{ formatQuantity(detailData.totalQuantity) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总金额">
+          {{ formatPrice(detailData.totalAmount) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">
+          {{ formatNullableDate(detailData.createTime) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建人">
+          {{ detailData.creatorName || detailData.creator || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新时间">
+          {{ formatNullableDate(detailData.updateTime) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新人">
+          {{ detailData.updaterName || detailData.updater || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2" label="备注">
+          {{ detailData.remark || '-' }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
+      <el-table :data="detailRows" :summary-method="getSummaries" border show-summary>
+        <el-table-column label="商品名称" min-width="180" prop="itemName">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" min-width="180" prop="skuName">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="140">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="140">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="数量" prop="quantity" width="120">
+          <template #default="scope">
+            {{ formatQuantity(scope.row.quantity) || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" width="100" />
+        <el-table-column align="right" label="单价" prop="unitPrice" width="140">
+          <template #default="scope">
+            {{ formatPrice(scope.row.unitPrice) || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="总价" prop="amount" width="140">
+          <template #default="scope">
+            {{ formatPrice(scope.row.amount) || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
+import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
+
+/** WMS 入库单详情 */
+defineOptions({ name: 'WmsReceiptOrderDetail' })
+
+interface DetailRow extends ReceiptOrderDetailVO {
+  unitPrice?: number
+}
+
+const loading = ref(false) // 加载中
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailData = ref<ReceiptOrderVO>({}) // 详情数据
+const detailRows = computed<DetailRow[]>(() =>
+  (detailData.value.details || []).map((detail) => ({
+    ...detail,
+    unitPrice:
+      detail.amount != null && detail.quantity
+        ? Number(detail.amount) / Number(detail.quantity)
+        : undefined
+  }))
+)
+
+// TODO @AI：抽到 date 或者 time ts 全局的工具里。
+const formatNullableDate = (value?: Date | string, format?: string) => {
+  return value ? formatDate(value as Date, format) : ''
+}
+
+const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'amount') {
+      return formatSumPrice(data, (detail) => detail.amount)
+    }
+    return ''
+  })
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  loading.value = true
+  try {
+    detailData.value = await ReceiptOrderApi.getReceiptOrder(id)
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open })
+</script>
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
new file mode 100644
index 000000000..6a2062d21
--- /dev/null
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -0,0 +1,133 @@
+<!-- WMS 入库单打印 -->
+<template>
+  <div class="hidden">
+    <button ref="printButtonRef" v-print="printObj" type="button"></button>
+    <div id="wmsReceiptOrderPrint" class="color-#303133">
+      <h2 class="text-center">入库单</h2>
+      <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
+        <div>入库单号：{{ printData.no || '-' }}</div>
+        <div>
+          入库类型：{{ getDictLabel(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE, printData.type) || '-' }}
+        </div>
+        <div>入库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>供应商：{{ printData.merchantName || '-' }}</div>
+        <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
+        <div>仓库：{{ printData.warehouseName || '-' }}</div>
+        <div v-if="AREA_ENABLE">库区：{{ printData.areaName || '-' }}</div>
+        <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
+        <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
+        <div>创建时间：{{ formatNullableDate(printData.createTime) || '-' }}</div>
+        <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
+      </div>
+      <table class="w-full border-collapse text-13px">
+        <thead>
+          <tr>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
+            <th
+              v-if="AREA_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              库区
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              批号
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              生产日期
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              过期日期
+            </th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="detail in printData.details || []" :key="detail.id">
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.itemName || '-' }}</div>
+              <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.skuName || '-' }}</div>
+              <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
+            </td>
+            <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ detail.areaName || '-' }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ detail.batchNo || '-' }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') || '-' }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatQuantity(detail.quantity) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.amount) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
+          </tr>
+          <tr v-if="!printData.details?.length">
+            <td
+              class="border border-solid border-#dcdfe6 p-8px text-center"
+              :colspan="tableColumnCount"
+            >
+              暂无明细
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+
+/** WMS 入库单打印 */
+defineOptions({ name: 'WmsReceiptOrderPrint' })
+
+const printData = ref<ReceiptOrderVO>({}) // 打印数据
+const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
+const tableColumnCount = computed(() => 5 + (AREA_ENABLE ? 1 : 0) + (BATCH_ENABLE ? 3 : 0))
+const printObj = ref({
+  id: 'wmsReceiptOrderPrint',
+  popTitle: '&nbsp',
+  extraCss: '/print.css',
+  extraHead: '',
+  zIndex: 20003
+})
+
+// TODO @AI：抽到 date 或者 time ts 全局的工具里。
+const formatNullableDate = (value?: Date | string, format?: string) => {
+  return value ? formatDate(value as Date, format) : ''
+}
+
+/** 打印入库单 */
+const print = async (id: number) => {
+  printData.value = await ReceiptOrderApi.getReceiptOrder(id)
+  await nextTick()
+  printButtonRef.value?.click()
+}
+defineExpose({ print })
+</script>
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
new file mode 100644
index 000000000..7a486c9a0
--- /dev/null
+++ b/src/views/wms/order/receipt/index.vue
@@ -0,0 +1,613 @@
+<!-- WMS 入库单 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="80px"
+    >
+      <el-form-item label="入库单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          class="!w-240px"
+          clearable
+          placeholder="请输入入库单号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择单据状态"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          @change="handleWarehouseChange"
+        />
+      </el-form-item>
+      <el-form-item label="供应商" prop="merchantId">
+        <MerchantSelect
+          v-model="queryParams.merchantId"
+          class="!w-240px"
+          placeholder="请选择供应商"
+          supplier
+        />
+      </el-form-item>
+      <el-form-item label="单据日期" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="数量" prop="totalQuantityMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalQuantityMin"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalQuantityMax"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="总金额" prop="totalAmountMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalAmountMin"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalAmountMax"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="入库类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          class="!w-240px"
+          clearable
+          placeholder="请选择入库类型"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建用户" prop="creator">
+        <UserSelectV2
+          v-model="queryParams.creator"
+          class="!w-240px"
+          placeholder="请选择创建用户"
+        />
+      </el-form-item>
+      <el-form-item label="更新用户" prop="updater">
+        <UserSelectV2
+          v-model="queryParams.updater"
+          class="!w-240px"
+          placeholder="请选择更新用户"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-popover
+          popper-class="wms-receipt-order-table-setting-popover"
+          trigger="click"
+          width="520"
+        >
+          <template #reference>
+            <el-button>
+              <Icon class="mr-5px" icon="ep:setting" />
+              表格设置
+            </el-button>
+          </template>
+          <el-checkbox-group
+            v-model="checkedTableColumns"
+            class="wms-receipt-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+          >
+            <el-checkbox
+              v-for="column in tableColumnOptions"
+              :key="column.value"
+              :label="column.value"
+            >
+              {{ column.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-popover>
+        <el-button
+          v-hasPermi="['wms:receipt-order:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:receipt-order:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 入库单列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :cell-class-name="'wms-receipt-order-cell'"
+      :data="list"
+      :show-overflow-tooltip="true"
+      border
+      @expand-change="handleExpandChange"
+    >
+      <el-table-column type="expand" width="48">
+        <template #default="scope">
+          <el-table :data="detailMap[scope.row.id] || []" border>
+            <el-table-column label="商品信息" min-width="220">
+              <template #default="detailScope">
+                <div>{{ detailScope.row.itemName || '-' }}</div>
+                <div v-if="detailScope.row.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detailScope.row.itemCode }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格信息" min-width="220">
+              <template #default="detailScope">
+                <div>{{ detailScope.row.skuName || '-' }}</div>
+                <div v-if="detailScope.row.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detailScope.row.skuCode }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="AREA_ENABLE"
+              align="center"
+              label="库区"
+              min-width="140"
+              prop="areaName"
+            />
+            <el-table-column
+              v-if="BATCH_ENABLE"
+              align="center"
+              label="批号"
+              min-width="140"
+              prop="batchNo"
+            />
+            <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+              <template #default="detailScope">
+                <div v-if="detailScope.row.productionDate">
+                  生产日期：{{ formatDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
+                </div>
+                <div v-if="detailScope.row.expirationDate">
+                  过期日期：{{ formatDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="入库数量" width="120">
+              <template #default="detailScope">
+                {{ formatQuantity(detailScope.row.quantity) }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="金额(元)" width="120">
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.amount) || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="160" prop="remark" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="210">
+        <template #default="scope">
+          <div>
+            单号：
+            <el-button link type="primary" @click="openDetail(scope.row.id)">
+              {{ scope.row.no }}
+            </el-button>
+          </div>
+          <div v-if="scope.row.bizOrderNo" class="text-12px text-gray-500">
+            业务：{{ scope.row.bizOrderNo }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('status')"
+        align="center"
+        fixed="left"
+        label="入库状态"
+        width="110"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('type')"
+        align="center"
+        label="入库类型"
+        width="120"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_RECEIPT_ORDER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('warehouse')"
+        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        min-width="160"
+      >
+        <template #default="scope">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
+            <div>库区：{{ scope.row.areaName || '-' }}</div>
+          </template>
+          <template v-else>
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('quantityAmount')"
+        label="总数量/总金额(元)"
+        min-width="180"
+      >
+        <template #default="scope">
+          <div class="flex items-center justify-between">
+            <span>数量：</span>
+            <span>{{ formatQuantity(scope.row.totalQuantity) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(scope.row.totalAmount) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('merchant')"
+        label="供应商"
+        min-width="160"
+        prop="merchantName"
+      />
+      <el-table-column
+        v-if="isTableColumnVisible('operateTime')"
+        label="操作时间"
+        min-width="160"
+      >
+        <template #default="scope">
+          <div>创建：{{ formatNullableTime(scope.row.createTime) }}</div>
+          <div>更新：{{ formatNullableTime(scope.row.updateTime) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isTableColumnVisible('operator')" label="操作人" min-width="120">
+        <template #default="scope">
+          <div>创建：{{ scope.row.creatorName || scope.row.creator || '-' }}</div>
+          <div>更新：{{ scope.row.updaterName || scope.row.updater || '-' }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column align="center" fixed="right" label="操作" width="180">
+        <template #default="scope">
+          <el-button
+            v-if="scope.row.status === OrderStatusEnum.PREPARE"
+            v-hasPermi="['wms:receipt-order:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-hasPermi="['wms:receipt-order:print']"
+            link
+            type="primary"
+            @click="handlePrint(scope.row.id)"
+          >
+            打印
+          </el-button>
+          <el-button
+            v-if="scope.row.status === OrderStatusEnum.PREPARE"
+            v-hasPermi="['wms:receipt-order:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ReceiptOrderForm ref="formRef" @success="getList" />
+  <ReceiptOrderDetail ref="detailRef" />
+  <ReceiptOrderPrint ref="printRef" />
+</template>
+
+<script lang="ts" setup>
+import { defaultShortcuts, formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
+import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
+import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderStatusEnum } from '@/views/wms/utils/constants'
+import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
+import ReceiptOrderDetail from './ReceiptOrderDetail.vue'
+import ReceiptOrderForm from './ReceiptOrderForm.vue'
+import ReceiptOrderPrint from './ReceiptOrderPrint.vue'
+import download from '@/utils/download'
+
+/** WMS 入库单 */
+defineOptions({ name: 'WmsReceiptOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+type TableColumnKey =
+  | 'no'
+  | 'status'
+  | 'type'
+  | 'warehouse'
+  | 'quantityAmount'
+  | 'merchant'
+  | 'operateTime'
+  | 'operator'
+  | 'remark'
+
+const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
+  { label: '单号/业务单号', value: 'no' },
+  { label: '入库状态', value: 'status' },
+  { label: '入库类型', value: 'type' },
+  { label: '仓库', value: 'warehouse' },
+  { label: '数量/金额(元)', value: 'quantityAmount' },
+  { label: '供应商', value: 'merchant' },
+  { label: '操作时间', value: 'operateTime' },
+  { label: '操作人', value: 'operator' },
+  { label: '备注', value: 'remark' }
+]
+const checkedTableColumns = ref<TableColumnKey[]>([
+  'no',
+  'status',
+  'type',
+  'warehouse',
+  'quantityAmount',
+  'merchant',
+  'operateTime',
+  'operator',
+  'remark'
+])
+const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ReceiptOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined as string | undefined,
+  status: undefined as number | undefined,
+  warehouseId: undefined as number | undefined,
+  merchantId: undefined as number | undefined,
+  orderDate: undefined as string[] | undefined,
+  totalQuantityMin: undefined as number | undefined,
+  totalQuantityMax: undefined as number | undefined,
+  totalAmountMin: undefined as number | undefined,
+  totalAmountMax: undefined as number | undefined,
+  type: undefined as number | undefined,
+  bizOrderNo: undefined as string | undefined,
+  creator: undefined as number | undefined,
+  updater: undefined as number | undefined,
+  createTime: undefined as string[] | undefined,
+  updateTime: undefined as string[] | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细缓存
+
+/** 格式化列表时间 */
+// TODO @AI：抽到 date 或者 time ts 全局的工具里。
+const formatNullableTime = (value?: Date | string) => {
+  return value ? formatDate(value as Date, 'MM-DD HH:mm') : '-'
+}
+
+/** 查询入库单列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ReceiptOrderApi.getReceiptOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  handleQuery()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  handleQuery()
+}
+
+/** 展开明细 */
+const handleExpandChange = async (row: ReceiptOrderVO) => {
+  if (!row.id || detailMap[row.id]) {
+    return
+  }
+  detailMap[row.id] = await ReceiptOrderApi.getReceiptOrderDetailListByOrderId(row.id)
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 查看入库单详情 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 打印入库单 */
+const printRef = ref()
+const handlePrint = (id: number) => {
+  printRef.value.print(id)
+}
+
+/** 删除入库单 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ReceiptOrderApi.deleteReceiptOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ReceiptOrderApi.exportReceiptOrder(queryParams)
+    download.excel(data, '入库单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style scoped>
+:deep(.wms-receipt-order-cell) {
+  vertical-align: top;
+}
+
+:global(.wms-receipt-order-table-setting-popover) {
+  padding: 12px;
+}
+
+:global(.wms-receipt-order-table-setting) {
+  background-color: var(--el-fill-color-light);
+}
+
+:global(.wms-receipt-order-table-setting .el-checkbox) {
+  height: 28px;
+  margin-right: 0;
+}
+
+:global(.wms-receipt-order-table-setting .el-checkbox__label) {
+  font-size: 16px;
+  font-weight: 600;
+}
+</style>

From ac49ba5c6d2b5e41d06723046bc54f7b1ca1cde2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 May 2026 23:34:45 +0800
Subject: [PATCH 14/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=20select=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/merchant/index.ts              |  6 +-
 .../md/merchant/components/MerchantSelect.vue | 94 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/views/wms/md/merchant/components/MerchantSelect.vue

diff --git a/src/api/wms/md/merchant/index.ts b/src/api/wms/md/merchant/index.ts
index 7a552a29a..94527ce18 100644
--- a/src/api/wms/md/merchant/index.ts
+++ b/src/api/wms/md/merchant/index.ts
@@ -18,6 +18,10 @@ export interface MerchantVO {
   createTime?: Date
 }
 
+export interface MerchantSimpleListReqVO {
+  types?: number[]
+}
+
 // WMS 往来企业 API
 export const MerchantApi = {
   // 查询往来企业分页
@@ -26,7 +30,7 @@ export const MerchantApi = {
   },
 
   // 查询往来企业精简列表
-  getMerchantSimpleList: async (params?: any) => {
+  getMerchantSimpleList: async (params?: MerchantSimpleListReqVO) => {
     return await request.get({ url: '/wms/merchant/simple-list', params })
   },
 
diff --git a/src/views/wms/md/merchant/components/MerchantSelect.vue b/src/views/wms/md/merchant/components/MerchantSelect.vue
new file mode 100644
index 000000000..5f2b3f6e9
--- /dev/null
+++ b/src/views/wms/md/merchant/components/MerchantSelect.vue
@@ -0,0 +1,94 @@
+<!-- WMS 往来企业选择器 -->
+<template>
+  <el-select
+    v-bind="$attrs"
+    v-model="selectValue"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filter-method="handleFilter"
+    :placeholder="placeholder"
+    class="w-1/1"
+    filterable
+    @change="handleChange"
+  >
+    <el-option
+      v-for="merchant in filteredList"
+      :key="merchant.id!"
+      :label="merchant.name"
+      :value="merchant.id!"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { MerchantApi, MerchantVO } from '@/api/wms/md/merchant'
+import { SupplierMerchantTypeList } from '@/views/wms/utils/constants'
+
+/** WMS 往来企业选择器 */
+defineOptions({ name: 'WmsMerchantSelect', inheritAttrs: false })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    supplier?: boolean
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择往来企业'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [merchant: MerchantVO | undefined]
+}>()
+
+const merchantList = ref<MerchantVO[]>([]) // 往来企业列表
+const filteredList = ref<MerchantVO[]>([]) // 过滤后的往来企业列表
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+})
+
+/** 获得可选往来企业列表 */
+const loadSelectableList = async () => {
+  merchantList.value = await MerchantApi.getMerchantSimpleList(
+    props.supplier ? { types: SupplierMerchantTypeList } : undefined
+  )
+  handleFilter('')
+}
+
+/** 前端过滤 */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = merchantList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = merchantList.value.filter((merchant) =>
+    merchant.name?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (value: number | undefined) => {
+  emit(
+    'change',
+    merchantList.value.find((merchant) => merchant.id === value)
+  )
+}
+
+/** 供应商开关变化时，重新加载可选列表 */
+watch(
+  () => props.supplier,
+  () => loadSelectableList()
+)
+
+/** 初始化 */
+onMounted(() => loadSelectableList())
+</script>

From 765c8ea94f7a63b5d1d5788fe3febb434a1f287e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 00:42:29 +0800
Subject: [PATCH 15/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AA=E8=83=BD=E5=88=A0=E9=99=A4=E4=BD=9C?=
 =?UTF-8?q?=E5=BA=9F=E7=9A=84=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatTime.ts                       |  21 +-
 .../md/item/sku/components/ItemSkuSelect.vue  | 295 +++++++++++
 .../wms/order/receipt/ReceiptOrderDetail.vue  |  15 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    | 480 ++++++++++++++++++
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  13 +-
 src/views/wms/order/receipt/index.vue         |  21 +-
 src/views/wms/utils/order.ts                  |  12 +
 7 files changed, 826 insertions(+), 31 deletions(-)
 create mode 100644 src/views/wms/md/item/sku/components/ItemSkuSelect.vue
 create mode 100644 src/views/wms/order/receipt/ReceiptOrderForm.vue
 create mode 100644 src/views/wms/utils/order.ts

diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 99eb428c3..570464823 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -63,7 +63,7 @@ export const defaultShortcuts = [
  * @description format 季度 + 星期 + 几周："YYYY-MM-DD HH:mm:ss WWW QQQQ ZZZ"
  * @returns 返回拼接后的时间字符串
  */
-export function formatDate(date: Date, format?: string): string {
+export function formatDate(date: Date | string, format?: string): string {
   // 日期不存在，则返回空
   if (!date) {
     return ''
@@ -72,6 +72,25 @@ export function formatDate(date: Date, format?: string): string {
   return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
 }
 
+/**
+ * 格式化可为空的时间日期
+ *
+ * @param date 当前时间，new Date() 格式或者字符串时间格式
+ * @param format 需要转换的时间格式字符串
+ * @param emptyText 空值展示文案
+ * @returns 返回格式化后的时间字符串
+ */
+export function formatNullableDate(
+  date?: Date | string | null,
+  format = 'YYYY-MM-DD HH:mm:ss',
+  emptyText = '-'
+): string {
+  if (!date) {
+    return emptyText
+  }
+  return formatDate(date, format) || emptyText
+}
+
 /**
  * 获取当前的日期+时间
  */
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
new file mode 100644
index 000000000..ba9970aa0
--- /dev/null
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -0,0 +1,295 @@
+<!-- WMS 商品 SKU 选择器 -->
+<template>
+  <Dialog
+    v-model="dialogVisible"
+    :append-to-body="true"
+    :scroll="true"
+    max-height="calc(100vh - 220px)"
+    title="商品选择"
+    width="80%"
+  >
+    <ContentWrap>
+      <el-form
+        ref="queryFormRef"
+        :inline="true"
+        :model="queryParams"
+        class="-mb-15px"
+        label-width="80px"
+      >
+        <el-form-item label="商品名称" prop="itemName">
+          <el-input
+            v-model="queryParams.itemName"
+            class="!w-240px"
+            clearable
+            placeholder="请输入商品名称"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="商品编号" prop="itemCode">
+          <el-input
+            v-model="queryParams.itemCode"
+            class="!w-240px"
+            clearable
+            placeholder="请输入商品编号"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="规格名称" prop="skuName">
+          <el-input
+            v-model="queryParams.skuName"
+            class="!w-240px"
+            clearable
+            placeholder="请输入规格名称"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="规格编号" prop="skuCode">
+          <el-input
+            v-model="queryParams.skuCode"
+            class="!w-240px"
+            clearable
+            placeholder="请输入规格编号"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery">
+            <Icon class="mr-5px" icon="ep:search" />
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <ContentWrap class="!mb-0">
+      <el-table
+        ref="tableRef"
+        v-loading="loading"
+        :data="list"
+        :show-overflow-tooltip="true"
+        :stripe="true"
+        border
+        max-height="calc(100vh - 430px)"
+        row-key="id"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="handleRowDblClick"
+      >
+        <el-table-column :reserve-selection="true" align="center" type="selection" width="50" />
+        <el-table-column label="商品信息" min-width="220">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
+            <div v-if="row.brandName" class="text-12px text-gray-500">品牌：{{ row.brandName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220">
+          <template #default="{ row }">
+            <div>{{ row.name || '-' }}</div>
+            <div v-if="row.code" class="text-12px text-gray-500">编号：{{ row.code }}</div>
+            <div v-if="row.barCode" class="text-12px text-gray-500">条码：{{ row.barCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" min-width="160">
+          <template #default="{ row }">
+            <div v-if="row.costPrice !== undefined">成本价：{{ formatPrice(row.costPrice) }}</div>
+            <div v-if="row.sellingPrice !== undefined">销售价：{{ formatPrice(row.sellingPrice) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="重量(kg)" min-width="160">
+          <template #default="{ row }">
+            <div v-if="row.netWeight !== undefined">净重：{{ formatWeight(row.netWeight) }}</div>
+            <div v-if="row.grossWeight !== undefined">毛重：{{ formatWeight(row.grossWeight) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="长宽高(cm)" min-width="180">
+          <template #default="{ row }">
+            {{ formatDimensionText(row.length, row.width, row.height) || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="overflow-hidden">
+        <Pagination
+          v-model:limit="queryParams.pageSize"
+          v-model:page="queryParams.pageNo"
+          :total="total"
+          @pagination="getList"
+        />
+      </div>
+    </ContentWrap>
+
+    <template #footer>
+      <el-button type="primary" @click="handleConfirm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ElTable } from 'element-plus'
+import { ItemApi, ItemVO } from '@/api/wms/md/item'
+import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import { formatDimensionText, formatPrice, formatWeight } from '@/views/wms/utils/format'
+
+/** WMS 商品 SKU 选择器 */
+defineOptions({ name: 'WmsItemSkuSelect' })
+
+const message = useMessage() // 消息弹窗
+const loading = ref(false) // 列表的加载中
+const dialogVisible = ref(false) // 弹窗的是否展示
+const allList = ref<ItemSkuVO[]>([]) // 全部 SKU 列表
+const filteredList = ref<ItemSkuVO[]>([]) // 过滤后的 SKU 列表
+const list = ref<ItemSkuVO[]>([]) // 当前页 SKU 列表
+const total = ref(0) // 列表的总条数
+const selectedList = ref<ItemSkuVO[]>([]) // 已选择 SKU 列表
+const selectedMap = ref<Map<number, ItemSkuVO>>(new Map()) // 跨页已选择 SKU
+const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 SKU 编号
+const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
+const queryFormRef = ref() // 搜索的表单
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  itemName: undefined as string | undefined,
+  itemCode: undefined as string | undefined,
+  skuName: undefined as string | undefined,
+  skuCode: undefined as string | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+
+const emit = defineEmits<{
+  change: [list: ItemSkuVO[]]
+}>()
+
+/** 打开弹窗 */
+const open = async (selectedIds?: number[]) => {
+  dialogVisible.value = true
+  Object.assign(queryParams, getDefaultQueryParams())
+  selectedList.value = []
+  selectedMap.value = new Map()
+  preSelectedIds.value = selectedIds || []
+  await nextTick()
+  tableRef.value?.clearSelection()
+  await loadSkuList()
+}
+defineExpose({ open })
+
+/** 获得 SKU 列表 */
+const loadSkuList = async () => {
+  loading.value = true
+  try {
+    const items = await ItemApi.getItemSimpleList()
+    allList.value = items.flatMap((item: ItemVO) =>
+      (item.skus || []).map((sku) => ({
+        ...sku,
+        itemId: item.id,
+        itemCode: item.code,
+        itemName: item.name,
+        categoryId: item.categoryId,
+        categoryName: item.categoryName,
+        unit: item.unit,
+        brandId: item.brandId,
+        brandName: item.brandName
+      }))
+    )
+    initSelectedList()
+    getList()
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 初始化已选 SKU */
+const initSelectedList = () => {
+  if (preSelectedIds.value.length === 0) {
+    return
+  }
+  allList.value.forEach((sku) => {
+    if (sku.id && preSelectedIds.value.includes(sku.id)) {
+      selectedMap.value.set(sku.id, sku)
+    }
+  })
+  selectedList.value = Array.from(selectedMap.value.values())
+}
+
+/** 查询 SKU 列表 */
+const getList = async () => {
+  filteredList.value = allList.value.filter((sku) => {
+    return (
+      includes(sku.itemName, queryParams.itemName) &&
+      includes(sku.itemCode, queryParams.itemCode) &&
+      includes(sku.name, queryParams.skuName) &&
+      includes(sku.code, queryParams.skuCode)
+    )
+  })
+  total.value = filteredList.value.length
+  const start = (queryParams.pageNo - 1) * queryParams.pageSize
+  list.value = filteredList.value.slice(start, start + queryParams.pageSize)
+  await nextTick()
+  applyPreSelection()
+}
+
+const includes = (value?: string, keyword?: string) => {
+  if (!keyword) {
+    return true
+  }
+  return (value || '').toLowerCase().includes(keyword.toLowerCase())
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  queryFormRef.value?.resetFields()
+  getList()
+}
+
+/** 恢复预选状态（当前页可见范围内） */
+const applyPreSelection = () => {
+  const table = tableRef.value
+  if (!table || selectedMap.value.size === 0) {
+    return
+  }
+  list.value.forEach((row) => {
+    if (row.id && selectedMap.value.has(row.id)) {
+      table.toggleRowSelection(row, true)
+    }
+  })
+}
+
+/** 选择变化 */
+const handleSelectionChange = (rows: ItemSkuVO[]) => {
+  const currentPageIds = list.value.map((row) => row.id).filter((id): id is number => !!id)
+  currentPageIds.forEach((id) => selectedMap.value.delete(id))
+  rows.forEach((row) => {
+    if (row.id) {
+      selectedMap.value.set(row.id, row)
+    }
+  })
+  selectedList.value = Array.from(selectedMap.value.values())
+}
+
+/** 双击行：切换勾选 */
+const handleRowDblClick = (row: ItemSkuVO) => {
+  tableRef.value?.toggleRowSelection(row)
+}
+
+/** 确认选择 */
+const handleConfirm = () => {
+  if (selectedList.value.length === 0) {
+    message.warning('请至少选择一条数据')
+    return
+  }
+  emit('change', selectedList.value)
+  dialogVisible.value = false
+}
+</script>
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index fee28e295..12e1c3076 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -40,13 +40,13 @@
           {{ formatPrice(detailData.totalAmount) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="创建时间">
-          {{ formatNullableDate(detailData.createTime) || '-' }}
+          {{ formatNullableDate(detailData.createTime) }}
         </el-descriptions-item>
         <el-descriptions-item label="创建人">
           {{ detailData.creatorName || detailData.creator || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="更新时间">
-          {{ formatNullableDate(detailData.updateTime) || '-' }}
+          {{ formatNullableDate(detailData.updateTime) }}
         </el-descriptions-item>
         <el-descriptions-item label="更新人">
           {{ detailData.updaterName || detailData.updater || '-' }}
@@ -78,12 +78,12 @@
         <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
         <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="140">
           <template #default="scope">
-            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') || '-' }}
+            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
           </template>
         </el-table-column>
         <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="140">
           <template #default="scope">
-            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') || '-' }}
+            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
           </template>
         </el-table-column>
         <el-table-column align="right" label="数量" prop="quantity" width="120">
@@ -108,7 +108,7 @@
 </template>
 
 <script lang="ts" setup>
-import { formatDate } from '@/utils/formatTime'
+import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
@@ -140,11 +140,6 @@ const detailRows = computed<DetailRow[]>(() =>
   }))
 )
 
-// TODO @AI：抽到 date 或者 time ts 全局的工具里。
-const formatNullableDate = (value?: Date | string, format?: string) => {
-  return value ? formatDate(value as Date, format) : ''
-}
-
 const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
   columns.map((column, index) => {
     if (index === 0) {
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
new file mode 100644
index 000000000..ac9e0c014
--- /dev/null
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -0,0 +1,480 @@
+<!-- WMS 入库单表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="92px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="入库单号" prop="no">
+            <el-input v-model="formData.no" maxlength="64" placeholder="请输入入库单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="入库类型" prop="type">
+            <el-select v-model="formData.type" class="w-1/1" placeholder="请选择入库类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="供应商" prop="merchantId">
+            <MerchantSelect
+              v-model="formData.merchantId"
+              placeholder="请选择供应商"
+              supplier
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="业务单号" prop="bizOrderNo">
+            <el-input v-model="formData.bizOrderNo" maxlength="64" placeholder="请输入业务单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="AREA_ENABLE" :span="8">
+          <el-form-item label="库区" prop="areaId">
+            <WarehouseAreaSelect
+              v-model="formData.areaId"
+              :warehouse-id="formData.warehouseId"
+              @change="handleAreaChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="AREA_ENABLE ? 8 : 16">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div class="mb-12px flex items-center justify-between">
+        <span class="text-14px font-bold">入库明细</span>
+        <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+          <Icon class="mr-5px" icon="ep:plus" />
+          添加商品
+        </el-button>
+      </div>
+      <el-table :data="formData.details" border empty-text="暂无商品明细">
+        <el-table-column label="商品信息" min-width="220">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="180">
+          <template #default="scope">
+            <WarehouseAreaSelect
+              v-model="scope.row.areaId"
+              :disabled="!formData.warehouseId || !!formData.areaId"
+              :warehouse-id="formData.warehouseId"
+              placeholder="请选择库区"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="160">
+          <template #default="scope">
+            <el-input v-model="scope.row.batchNo" maxlength="64" placeholder="请输入批号" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="180">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.productionDate"
+              class="!w-1/1"
+              placeholder="请选择生产日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="180">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.expirationDate"
+              class="!w-1/1"
+              placeholder="请选择过期日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.quantity"
+              :controls="false"
+              :min="0"
+              :precision="QUANTITY_PRECISION"
+              class="!w-1/1"
+              placeholder="数量"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.amount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="金额"
+              @change="handleDetailAmountChange"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="180">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="scope">
+            <el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <ItemSkuSelect ref="skuSelectRef" @change="handleSelectSku" />
+    </el-form>
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:receipt-order:complete']"
+            :disabled="formLoading"
+            type="success"
+            @click="handleComplete"
+          >
+            完成入库
+          </el-button>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:receipt-order:cancel']"
+            :disabled="formLoading"
+            type="danger"
+            @click="handleCancel"
+          >
+            作废
+          </el-button>
+        </div>
+        <div>
+          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">
+            保存
+          </el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { FormRules } from 'element-plus'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
+import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
+import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import ItemSkuSelect from '@/views/wms/md/item/sku/components/ItemSkuSelect.vue'
+import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderStatusEnum } from '@/views/wms/utils/constants'
+import {
+  formatQuantity,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION,
+  sumPrice,
+  sumQuantity
+} from '@/views/wms/utils/format'
+import { generateOrderNo } from '@/views/wms/utils/order'
+
+/** WMS 入库单表单 */
+defineOptions({ name: 'WmsReceiptOrderForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const originalFormData = ref('') // 表单原始数据快照
+const formData = ref<ReceiptOrderVO>({
+  id: undefined,
+  no: undefined,
+  type: undefined,
+  status: OrderStatusEnum.PREPARE,
+  bizOrderNo: undefined,
+  merchantId: undefined,
+  warehouseId: undefined,
+  areaId: undefined,
+  totalQuantity: 0,
+  totalAmount: 0,
+  remark: undefined,
+  details: []
+})
+const formRules = reactive<FormRules>({
+  no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '入库类型不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
+
+const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
+const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const isPrepareOrder = computed(
+  () => !formData.value.id || formData.value.status === OrderStatusEnum.PREPARE
+)
+const isSavedPrepareOrder = computed(
+  () => !!formData.value.id && formData.value.status === OrderStatusEnum.PREPARE
+)
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const order = await ReceiptOrderApi.getReceiptOrder(id)
+      formData.value = {
+        ...order,
+        details: order.details || []
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  originalFormData.value = JSON.stringify(buildSubmitData())
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 构建入库明细 */
+const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
+  id: undefined,
+  itemId: sku.itemId,
+  itemCode: sku.itemCode,
+  itemName: sku.itemName,
+  unit: sku.unit,
+  skuId: sku.id,
+  skuCode: sku.code,
+  skuName: sku.name,
+  areaId: formData.value.areaId,
+  batchNo: undefined,
+  productionDate: undefined,
+  expirationDate: undefined,
+  quantity: undefined,
+  amount: undefined,
+  remark: undefined
+})
+
+/** 添加商品 */
+const handleAddDetail = () => {
+  skuSelectRef.value?.open()
+}
+
+/** 选择商品 SKU */
+const handleSelectSku = (skus: ItemSkuVO[]) => {
+  if (!skus.length) {
+    return
+  }
+  formData.value.details = formData.value.details || []
+  skus.forEach((sku) => formData.value.details!.push(buildDetail(sku)))
+  refreshTotalAmount()
+}
+
+/** 删除明细 */
+const handleDeleteDetail = (index: number) => {
+  formData.value.details?.splice(index, 1)
+  refreshTotalAmount()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  formData.value.areaId = undefined
+  formData.value.details?.forEach((detail) => (detail.areaId = undefined))
+}
+
+/** 库区变化 */
+const handleAreaChange = () => {
+  formData.value.details?.forEach((detail) => (detail.areaId = formData.value.areaId))
+}
+
+/** 明细金额变化 */
+const handleDetailAmountChange = () => {
+  refreshTotalAmount()
+}
+
+/** 汇总明细金额 */
+const refreshTotalAmount = () => {
+  formData.value.totalAmount = detailTotalAmount.value
+}
+
+/** 校验明细 */
+const validateDetails = (required: boolean) => {
+  if (!formData.value.details?.length) {
+    if (required) {
+      message.error('至少包含一条入库明细')
+      return false
+    }
+    return true
+  }
+  for (let i = 0; i < formData.value.details.length; i++) {
+    const detail = formData.value.details[i]
+    if (!detail.skuId) {
+      message.error(`第 ${i + 1} 行明细请选择商品规格`)
+      return false
+    }
+    if (AREA_ENABLE && !detail.areaId) {
+      message.error(`第 ${i + 1} 行明细请选择库区`)
+      return false
+    }
+    if (!detail.quantity || detail.quantity <= 0) {
+      message.error(`第 ${i + 1} 行明细入库数量必须大于 0`)
+      return false
+    }
+  }
+  return true
+}
+
+/** 构建提交数据 */
+const buildSubmitData = () =>
+  ({
+    ...formData.value,
+    totalQuantity: totalQuantity.value,
+    totalAmount: formData.value.totalAmount,
+    details: formData.value.details || []
+  }) as ReceiptOrderVO
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  if (!validateDetails(false)) {
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = buildSubmitData()
+    if (formType.value === 'create') {
+      await ReceiptOrderApi.createReceiptOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ReceiptOrderApi.updateReceiptOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 完成入库：表单修改过则先保存，再完成 */
+const handleComplete = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(true)) {
+    return
+  }
+  try {
+    await message.confirm('确认完成入库？完成后将更新库存。')
+    formLoading.value = true
+    const data = buildSubmitData()
+    if (JSON.stringify(data) !== originalFormData.value) {
+      await ReceiptOrderApi.updateReceiptOrder(data)
+    }
+    await ReceiptOrderApi.completeReceiptOrder(formData.value.id!)
+    message.success('入库成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 作废入库单 */
+const handleCancel = async () => {
+  try {
+    await message.confirm('确认作废该入库单？作废后不可恢复。')
+    formLoading.value = true
+    await ReceiptOrderApi.cancelReceiptOrder(formData.value.id!)
+    message.success('作废成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    no: generateOrderNo('RK'),
+    type: undefined,
+    status: OrderStatusEnum.PREPARE,
+    bizOrderNo: undefined,
+    merchantId: undefined,
+    warehouseId: undefined,
+    areaId: undefined,
+    totalQuantity: 0,
+    totalAmount: 0,
+    remark: undefined,
+    details: []
+  }
+  originalFormData.value = ''
+  nextTick(() => formRef.value?.clearValidate())
+}
+</script>
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 6a2062d21..da0b23715 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -16,7 +16,7 @@
         <div v-if="AREA_ENABLE">库区：{{ printData.areaName || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
-        <div>创建时间：{{ formatNullableDate(printData.createTime) || '-' }}</div>
+        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
       <table class="w-full border-collapse text-13px">
@@ -70,10 +70,10 @@
               {{ detail.batchNo || '-' }}
             </td>
             <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') || '-' }}
+              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
             </td>
             <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') || '-' }}
+              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
             </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
               {{ formatQuantity(detail.quantity) || '-' }}
@@ -98,7 +98,7 @@
 </template>
 
 <script lang="ts" setup>
-import { formatDate } from '@/utils/formatTime'
+import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
@@ -118,11 +118,6 @@ const printObj = ref({
   zIndex: 20003
 })
 
-// TODO @AI：抽到 date 或者 time ts 全局的工具里。
-const formatNullableDate = (value?: Date | string, format?: string) => {
-  return value ? formatDate(value as Date, format) : ''
-}
-
 /** 打印入库单 */
 const print = async (id: number) => {
   printData.value = await ReceiptOrderApi.getReceiptOrder(id)
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 7a486c9a0..c8fed1d03 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -254,10 +254,10 @@
             <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
               <template #default="detailScope">
                 <div v-if="detailScope.row.productionDate">
-                  生产日期：{{ formatDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
+                  生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
                 </div>
                 <div v-if="detailScope.row.expirationDate">
-                  过期日期：{{ formatDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
+                  过期日期：{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
                 </div>
               </template>
             </el-table-column>
@@ -352,8 +352,8 @@
         min-width="160"
       >
         <template #default="scope">
-          <div>创建：{{ formatNullableTime(scope.row.createTime) }}</div>
-          <div>更新：{{ formatNullableTime(scope.row.updateTime) }}</div>
+          <div>创建：{{ formatNullableDate(scope.row.createTime, 'MM-DD HH:mm') }}</div>
+          <div>更新：{{ formatNullableDate(scope.row.updateTime, 'MM-DD HH:mm') }}</div>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operator')" label="操作人" min-width="120">
@@ -375,7 +375,7 @@
             修改
           </el-button>
           <el-button
-            v-hasPermi="['wms:receipt-order:print']"
+            v-hasPermi="['wms:receipt-order:query']"
             link
             type="primary"
             @click="handlePrint(scope.row.id)"
@@ -383,7 +383,7 @@
             打印
           </el-button>
           <el-button
-            v-if="scope.row.status === OrderStatusEnum.PREPARE"
+            v-if="canDeleteReceiptOrder(scope.row.status)"
             v-hasPermi="['wms:receipt-order:delete']"
             link
             type="danger"
@@ -410,7 +410,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defaultShortcuts, formatDate } from '@/utils/formatTime'
+import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
@@ -493,10 +493,9 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细缓存
 
-/** 格式化列表时间 */
-// TODO @AI：抽到 date 或者 time ts 全局的工具里。
-const formatNullableTime = (value?: Date | string) => {
-  return value ? formatDate(value as Date, 'MM-DD HH:mm') : '-'
+/** 是否允许删除入库单 */
+const canDeleteReceiptOrder = (status?: number) => {
+  return status !== undefined && [OrderStatusEnum.PREPARE, OrderStatusEnum.CANCELED].includes(status)
 }
 
 /** 查询入库单列表 */
diff --git a/src/views/wms/utils/order.ts b/src/views/wms/utils/order.ts
new file mode 100644
index 000000000..ed4671647
--- /dev/null
+++ b/src/views/wms/utils/order.ts
@@ -0,0 +1,12 @@
+/**
+ * WMS 订单工具
+ */
+
+/** 生成业务单号：前缀 + 月日 + 4 位随机数 */
+export const generateOrderNo = (prefix: string) => {
+  const now = new Date()
+  const month = String(now.getMonth() + 1).padStart(2, '0')
+  const day = String(now.getDate()).padStart(2, '0')
+  const randomNo = String(Math.floor(Math.random() * 10000)).padStart(4, '0')
+  return `${prefix}${month}${day}${randomNo}`
+}

From b3b35e147b25e8594489156bb8d9f11b0653459f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 08:57:41 +0800
Subject: [PATCH 16/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/shipment/detail/index.ts    |  25 +
 src/api/wms/order/shipment/index.ts           |  77 +++
 src/utils/dict.ts                             |   1 +
 .../md/merchant/components/MerchantSelect.vue |  14 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    |  35 +-
 src/views/wms/order/receipt/index.vue         | 115 ++--
 .../order/shipment/ShipmentOrderDetail.vue    | 168 +++++
 .../wms/order/shipment/ShipmentOrderForm.vue  | 524 ++++++++++++++
 .../wms/order/shipment/ShipmentOrderPrint.vue | 128 ++++
 src/views/wms/order/shipment/index.vue        | 649 ++++++++++++++++++
 src/views/wms/utils/constants.ts              |  12 +
 11 files changed, 1696 insertions(+), 52 deletions(-)
 create mode 100644 src/api/wms/order/shipment/detail/index.ts
 create mode 100644 src/api/wms/order/shipment/index.ts
 create mode 100644 src/views/wms/order/shipment/ShipmentOrderDetail.vue
 create mode 100644 src/views/wms/order/shipment/ShipmentOrderForm.vue
 create mode 100644 src/views/wms/order/shipment/ShipmentOrderPrint.vue
 create mode 100644 src/views/wms/order/shipment/index.vue

diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
new file mode 100644
index 000000000..52017fef4
--- /dev/null
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -0,0 +1,25 @@
+// WMS 出库单明细 VO
+export interface ShipmentOrderDetailVO {
+  id?: number
+  orderId?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  inventoryDetailId?: number
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  quantity?: number
+  availableQuantity?: number
+  amount?: number
+  remark?: string
+  createTime?: Date
+}
diff --git a/src/api/wms/order/shipment/index.ts b/src/api/wms/order/shipment/index.ts
new file mode 100644
index 000000000..b9dc2fb59
--- /dev/null
+++ b/src/api/wms/order/shipment/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+import { ShipmentOrderDetailVO } from './detail'
+
+// WMS 出库单 VO
+export interface ShipmentOrderVO {
+  id?: number
+  no?: string
+  type?: number
+  status?: number
+  bizOrderNo?: string
+  merchantId?: number
+  merchantName?: string
+  remark?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  totalQuantity?: number
+  totalAmount?: number
+  details?: ShipmentOrderDetailVO[]
+  createTime?: Date
+  creator?: string
+  creatorName?: string
+  updateTime?: Date
+  updater?: string
+  updaterName?: string
+}
+
+// WMS 出库单 API
+export const ShipmentOrderApi = {
+  // 查询出库单分页
+  getShipmentOrderPage: async (params: any) => {
+    return await request.get({ url: '/wms/shipment-order/page', params })
+  },
+
+  // 查询出库单详情
+  getShipmentOrder: async (id: number) => {
+    return await request.get({ url: '/wms/shipment-order/get?id=' + id })
+  },
+
+  // 查询出库单明细
+  getShipmentOrderDetailListByOrderId: async (orderId: number) => {
+    return await request.get({
+      url: '/wms/shipment-order-detail/list-by-order-id?orderId=' + orderId
+    })
+  },
+
+  // 新增出库单
+  createShipmentOrder: async (data: ShipmentOrderVO) => {
+    return await request.post({ url: '/wms/shipment-order/create', data })
+  },
+
+  // 修改出库单
+  updateShipmentOrder: async (data: ShipmentOrderVO) => {
+    return await request.put({ url: '/wms/shipment-order/update', data })
+  },
+
+  // 完成出库
+  completeShipmentOrder: async (id: number) => {
+    return await request.put({ url: '/wms/shipment-order/complete?id=' + id })
+  },
+
+  // 作废出库单
+  cancelShipmentOrder: async (id: number) => {
+    return await request.put({ url: '/wms/shipment-order/cancel?id=' + id })
+  },
+
+  // 删除出库单
+  deleteShipmentOrder: async (id: number) => {
+    return await request.delete({ url: '/wms/shipment-order/delete?id=' + id })
+  },
+
+  // 导出出库单
+  exportShipmentOrder: async (params: any) => {
+    return await request.download({ url: '/wms/shipment-order/export-excel', params })
+  }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 02d91adde..df5dbc00a 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -221,6 +221,7 @@ export enum DICT_TYPE {
   WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型
   WMS_ORDER_STATUS = 'wms_order_status', // WMS 单据状态
   WMS_RECEIPT_ORDER_TYPE = 'wms_receipt_order_type', // WMS 入库单类型
+  WMS_SHIPMENT_ORDER_TYPE = 'wms_shipment_order_type', // WMS 出库单类型
 
   // ========== AI - 人工智能模块  ==========
   AI_PLATFORM = 'ai_platform', // AI 平台
diff --git a/src/views/wms/md/merchant/components/MerchantSelect.vue b/src/views/wms/md/merchant/components/MerchantSelect.vue
index 5f2b3f6e9..90bd59939 100644
--- a/src/views/wms/md/merchant/components/MerchantSelect.vue
+++ b/src/views/wms/md/merchant/components/MerchantSelect.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 import { MerchantApi, MerchantVO } from '@/api/wms/md/merchant'
-import { SupplierMerchantTypeList } from '@/views/wms/utils/constants'
+import { CustomerMerchantTypeList, SupplierMerchantTypeList } from '@/views/wms/utils/constants'
 
 /** WMS 往来企业选择器 */
 defineOptions({ name: 'WmsMerchantSelect', inheritAttrs: false })
@@ -31,6 +31,7 @@ const props = withDefaults(
   defineProps<{
     modelValue?: number
     supplier?: boolean
+    customer?: boolean
     disabled?: boolean
     clearable?: boolean
     placeholder?: string
@@ -57,9 +58,12 @@ const selectValue = computed({
 
 /** 获得可选往来企业列表 */
 const loadSelectableList = async () => {
-  merchantList.value = await MerchantApi.getMerchantSimpleList(
-    props.supplier ? { types: SupplierMerchantTypeList } : undefined
-  )
+  const types = props.supplier
+    ? SupplierMerchantTypeList
+    : props.customer
+      ? CustomerMerchantTypeList
+      : undefined
+  merchantList.value = await MerchantApi.getMerchantSimpleList(types ? { types } : undefined)
   handleFilter('')
 }
 
@@ -85,7 +89,7 @@ const handleChange = (value: number | undefined) => {
 
 /** 供应商开关变化时，重新加载可选列表 */
 watch(
-  () => props.supplier,
+  () => [props.supplier, props.customer],
   () => loadSelectableList()
 )
 
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index ac9e0c014..adb39aaae 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -73,17 +73,31 @@
         </el-col>
         <el-col :span="AREA_ENABLE ? 8 : 16">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" />
+            <el-input
+              v-model="formData.remark"
+              maxlength="255"
+              placeholder="请输入备注"
+              :rows="3"
+              type="textarea"
+            />
           </el-form-item>
         </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
         <span class="text-14px font-bold">入库明细</span>
-        <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
-          <Icon class="mr-5px" icon="ep:plus" />
-          添加商品
-        </el-button>
+        <el-tooltip
+          content="请先选择仓库"
+          :disabled="!!formData.warehouseId"
+          placement="top"
+        >
+          <span>
+            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+              <Icon class="mr-5px" icon="ep:plus" />
+              添加商品
+            </el-button>
+          </span>
+        </el-tooltip>
       </div>
       <el-table :data="formData.details" border empty-text="暂无商品明细">
         <el-table-column label="商品信息" min-width="220">
@@ -221,7 +235,7 @@ import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vu
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
-import { OrderStatusEnum } from '@/views/wms/utils/constants'
+import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
   PRICE_PRECISION,
@@ -267,10 +281,15 @@ const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
 const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
 const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
 const isPrepareOrder = computed(
-  () => !formData.value.id || formData.value.status === OrderStatusEnum.PREPARE
+  () =>
+    !formData.value.id ||
+    (formData.value.status !== undefined && OrderUpdateStatusList.includes(formData.value.status))
 )
 const isSavedPrepareOrder = computed(
-  () => !!formData.value.id && formData.value.status === OrderStatusEnum.PREPARE
+  () =>
+    !!formData.value.id &&
+    formData.value.status !== undefined &&
+    OrderUpdateStatusList.includes(formData.value.status)
 )
 
 /** 打开弹窗 */
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index c8fed1d03..aa05dbf26 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -275,7 +275,7 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="210">
+      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="290">
         <template #default="scope">
           <div>
             单号：
@@ -346,34 +346,55 @@
         min-width="160"
         prop="merchantName"
       />
-      <el-table-column
-        v-if="isTableColumnVisible('operateTime')"
-        label="操作时间"
-        min-width="160"
-      >
+      <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="scope">
-          <div>创建：{{ formatNullableDate(scope.row.createTime, 'MM-DD HH:mm') }}</div>
-          <div>更新：{{ formatNullableDate(scope.row.updateTime, 'MM-DD HH:mm') }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('operator')" label="操作人" min-width="120">
-        <template #default="scope">
-          <div>创建：{{ scope.row.creatorName || scope.row.creator || '-' }}</div>
-          <div>更新：{{ scope.row.updaterName || scope.row.updater || '-' }}</div>
+          <div>
+            创建：{{ formatNullableDate(scope.row.createTime) }} /
+            {{ scope.row.creatorName || scope.row.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(scope.row.updateTime) }} /
+            {{ scope.row.updaterName || scope.row.updater || '-' }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
       <el-table-column align="center" fixed="right" label="操作" width="180">
         <template #default="scope">
-          <el-button
-            v-if="scope.row.status === OrderStatusEnum.PREPARE"
-            v-hasPermi="['wms:receipt-order:update']"
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
+          <el-tooltip
+            :content="getReceiptOrderUpdateTip(scope.row.status)"
+            :disabled="canUpdateReceiptOrder(scope.row.status)"
+            placement="top"
           >
-            修改
-          </el-button>
+            <span>
+              <el-button
+                v-hasPermi="['wms:receipt-order:update']"
+                :disabled="!canUpdateReceiptOrder(scope.row.status)"
+                link
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+              >
+                修改
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-tooltip
+            :content="getReceiptOrderDeleteTip(scope.row.status)"
+            :disabled="canDeleteReceiptOrder(scope.row.status)"
+            placement="top"
+          >
+            <span>
+              <el-button
+                v-hasPermi="['wms:receipt-order:delete']"
+                :disabled="!canDeleteReceiptOrder(scope.row.status)"
+                link
+                type="danger"
+                @click="handleDelete(scope.row.id)"
+              >
+                删除
+              </el-button>
+            </span>
+          </el-tooltip>
           <el-button
             v-hasPermi="['wms:receipt-order:query']"
             link
@@ -382,15 +403,6 @@
           >
             打印
           </el-button>
-          <el-button
-            v-if="canDeleteReceiptOrder(scope.row.status)"
-            v-hasPermi="['wms:receipt-order:delete']"
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-          >
-            删除
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -417,7 +429,11 @@ import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
-import { OrderStatusEnum } from '@/views/wms/utils/constants'
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList
+} from '@/views/wms/utils/constants'
 import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import ReceiptOrderDetail from './ReceiptOrderDetail.vue'
@@ -438,8 +454,7 @@ type TableColumnKey =
   | 'warehouse'
   | 'quantityAmount'
   | 'merchant'
-  | 'operateTime'
-  | 'operator'
+  | 'operateInfo'
   | 'remark'
 
 const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
@@ -449,8 +464,7 @@ const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
   { label: '仓库', value: 'warehouse' },
   { label: '数量/金额(元)', value: 'quantityAmount' },
   { label: '供应商', value: 'merchant' },
-  { label: '操作时间', value: 'operateTime' },
-  { label: '操作人', value: 'operator' },
+  { label: '操作信息', value: 'operateInfo' },
   { label: '备注', value: 'remark' }
 ]
 const checkedTableColumns = ref<TableColumnKey[]>([
@@ -460,8 +474,7 @@ const checkedTableColumns = ref<TableColumnKey[]>([
   'warehouse',
   'quantityAmount',
   'merchant',
-  'operateTime',
-  'operator',
+  'operateInfo',
   'remark'
 ])
 const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
@@ -493,9 +506,33 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细缓存
 
+/** 是否允许修改入库单 */
+const canUpdateReceiptOrder = (status?: number) => {
+  return status !== undefined && OrderUpdateStatusList.includes(status)
+}
+
 /** 是否允许删除入库单 */
 const canDeleteReceiptOrder = (status?: number) => {
-  return status !== undefined && [OrderStatusEnum.PREPARE, OrderStatusEnum.CANCELED].includes(status)
+  return status !== undefined && OrderDeleteStatusList.includes(status)
+}
+
+/** 获得入库单修改禁用提示 */
+const getReceiptOrderUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已入库，无法修改'
+  }
+  if (status === OrderStatusEnum.CANCELED) {
+    return '已作废，无法修改'
+  }
+  return '当前状态无法修改'
+}
+
+/** 获得入库单删除禁用提示 */
+const getReceiptOrderDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已入库，无法删除'
+  }
+  return '当前状态无法删除'
 }
 
 /** 查询入库单列表 */
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
new file mode 100644
index 000000000..ddc0c6a14
--- /dev/null
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -0,0 +1,168 @@
+<!-- WMS 出库单详情 -->
+<template>
+  <Dialog v-model="dialogVisible" title="出库单详情" width="1200px">
+    <div v-loading="loading">
+      <div class="mb-16px text-18px font-bold">单据信息</div>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="出库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="出库类型">
+          <dict-tag
+            v-if="detailData.type !== undefined"
+            :type="DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE"
+            :value="detailData.type"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="仓库">
+          {{ detailData.warehouseName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="客户">
+          {{ detailData.merchantName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="业务单号">
+          {{ detailData.bizOrderNo || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="AREA_ENABLE" label="库区">
+          {{ detailData.areaName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总数量">
+          {{ formatQuantity(detailData.totalQuantity) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总金额">
+          {{ formatPrice(detailData.totalAmount) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">
+          {{ formatNullableDate(detailData.createTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建人">
+          {{ detailData.creatorName || detailData.creator || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新时间">
+          {{ formatNullableDate(detailData.updateTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新人">
+          {{ detailData.updaterName || detailData.updater || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2" label="备注">
+          {{ detailData.remark || '-' }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
+      <el-table :data="detailRows" :summary-method="getSummaries" border show-summary>
+        <el-table-column label="商品名称" min-width="180" prop="itemName">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" min-width="180" prop="skuName">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="140">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="140">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="数量" prop="quantity" width="120">
+          <template #default="scope">
+            {{ formatQuantity(scope.row.quantity) || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" width="100" />
+        <el-table-column align="right" label="单价" prop="unitPrice" width="140">
+          <template #default="scope">
+            {{ formatPrice(scope.row.unitPrice) || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="总价" prop="amount" width="140">
+          <template #default="scope">
+            {{ formatPrice(scope.row.amount) || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
+import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
+
+/** WMS 出库单详情 */
+defineOptions({ name: 'WmsShipmentOrderDetail' })
+
+interface DetailRow extends ShipmentOrderDetailVO {
+  unitPrice?: number
+}
+
+const loading = ref(false) // 加载中
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailData = ref<ShipmentOrderVO>({}) // 详情数据
+const detailRows = computed<DetailRow[]>(() =>
+  (detailData.value.details || []).map((detail) => ({
+    ...detail,
+    unitPrice:
+      detail.amount != null && detail.quantity
+        ? Number(detail.amount) / Number(detail.quantity)
+        : undefined
+  }))
+)
+
+const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'amount') {
+      return formatSumPrice(data, (detail) => detail.amount)
+    }
+    return ''
+  })
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  loading.value = true
+  try {
+    detailData.value = await ShipmentOrderApi.getShipmentOrder(id)
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open })
+</script>
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
new file mode 100644
index 000000000..90a3319d1
--- /dev/null
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -0,0 +1,524 @@
+<!-- WMS 出库单表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="92px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="出库单号" prop="no">
+            <el-input v-model="formData.no" maxlength="64" placeholder="请输入出库单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="出库类型" prop="type">
+            <el-select v-model="formData.type" class="w-1/1" placeholder="请选择出库类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户" prop="merchantId">
+            <MerchantSelect
+              v-model="formData.merchantId"
+              placeholder="请选择客户"
+              customer
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="业务单号" prop="bizOrderNo">
+            <el-input v-model="formData.bizOrderNo" maxlength="64" placeholder="请输入业务单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="AREA_ENABLE" :span="8">
+          <el-form-item label="库区" prop="areaId">
+            <WarehouseAreaSelect
+              v-model="formData.areaId"
+              :warehouse-id="formData.warehouseId"
+              @change="handleAreaChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="AREA_ENABLE ? 8 : 16">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="formData.remark"
+              maxlength="255"
+              placeholder="请输入备注"
+              :rows="3"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div class="mb-12px flex items-center justify-between">
+        <span class="text-14px font-bold">出库明细</span>
+        <el-tooltip
+          content="请先选择仓库"
+          :disabled="!!formData.warehouseId"
+          placement="top"
+        >
+          <span>
+            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+              <Icon class="mr-5px" icon="ep:plus" />
+              添加商品
+            </el-button>
+          </span>
+        </el-tooltip>
+      </div>
+      <el-table :data="formData.details" border empty-text="暂无商品明细">
+        <el-table-column label="商品信息" min-width="220">
+          <template #default="scope">
+            <div>{{ scope.row.itemName || '-' }}</div>
+            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ scope.row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220">
+          <template #default="scope">
+            <div>{{ scope.row.skuName || '-' }}</div>
+            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ scope.row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140">
+          <template #default="scope">
+            {{ scope.row.areaName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="160">
+          <template #default="scope">
+            {{ scope.row.batchNo || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="180">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="180">
+          <template #default="scope">
+            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="可用库存" width="120">
+          <template #default="scope">
+            {{ formatQuantity(scope.row.availableQuantity) || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出库数量" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.quantity"
+              :controls="false"
+              :min="0"
+              :precision="QUANTITY_PRECISION"
+              class="!w-1/1"
+              placeholder="数量"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.amount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="金额"
+              @change="handleDetailAmountChange"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="180">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="scope">
+            <el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <InventorySelect
+        ref="inventorySelectRef"
+        :area-id="formData.areaId"
+        :warehouse-id="formData.warehouseId"
+        @change="handleSelectInventory"
+      />
+    </el-form>
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:shipment-order:complete']"
+            :disabled="formLoading"
+            type="success"
+            @click="handleComplete"
+          >
+            完成出库
+          </el-button>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:shipment-order:cancel']"
+            :disabled="formLoading"
+            type="danger"
+            @click="handleCancel"
+          >
+            作废
+          </el-button>
+        </div>
+        <div>
+          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">
+            保存
+          </el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { FormRules } from 'element-plus'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
+import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
+import InventorySelect, {
+  InventorySelectRow
+} from '@/views/wms/inventory/components/InventorySelect.vue'
+import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { formatNullableDate } from '@/utils/formatTime'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import {
+  formatQuantity,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION,
+  sumPrice,
+  sumQuantity
+} from '@/views/wms/utils/format'
+import { generateOrderNo } from '@/views/wms/utils/order'
+
+/** WMS 出库单表单 */
+defineOptions({ name: 'WmsShipmentOrderForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const originalFormData = ref('') // 表单原始数据快照
+const formData = ref<ShipmentOrderVO>({
+  id: undefined,
+  no: undefined,
+  type: undefined,
+  status: OrderStatusEnum.PREPARE,
+  bizOrderNo: undefined,
+  merchantId: undefined,
+  warehouseId: undefined,
+  areaId: undefined,
+  totalQuantity: 0,
+  totalAmount: 0,
+  remark: undefined,
+  details: []
+})
+const formRules = reactive<FormRules>({
+  no: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '出库类型不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+const inventorySelectRef = ref() // 库存选择弹窗 Ref
+
+const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
+const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const isPrepareOrder = computed(
+  () =>
+    !formData.value.id ||
+    (formData.value.status !== undefined && OrderUpdateStatusList.includes(formData.value.status))
+)
+const isSavedPrepareOrder = computed(
+  () =>
+    !!formData.value.id &&
+    formData.value.status !== undefined &&
+    OrderUpdateStatusList.includes(formData.value.status)
+)
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const order = await ShipmentOrderApi.getShipmentOrder(id)
+      formData.value = {
+        ...order,
+        details: order.details || []
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  originalFormData.value = JSON.stringify(buildSubmitData())
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 构建出库明细 */
+const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
+  id: undefined,
+  itemId: inventory.itemId,
+  itemCode: inventory.itemCode,
+  itemName: inventory.itemName,
+  unit: inventory.unit,
+  skuId: inventory.skuId,
+  skuCode: inventory.skuCode,
+  skuName: inventory.skuName,
+  inventoryDetailId: inventory.inventoryDetailId,
+  warehouseId: inventory.warehouseId,
+  warehouseName: inventory.warehouseName,
+  areaId: inventory.areaId,
+  areaName: inventory.areaName,
+  batchNo: inventory.batchNo,
+  productionDate: inventory.productionDate,
+  expirationDate: inventory.expirationDate,
+  quantity: undefined,
+  availableQuantity: inventory.availableQuantity,
+  amount: undefined,
+  remark: undefined
+})
+
+/** 添加商品 */
+const handleAddDetail = () => {
+  inventorySelectRef.value?.open()
+}
+
+/** 选择库存 */
+const handleSelectInventory = (inventories: InventorySelectRow[]) => {
+  if (!inventories.length) {
+    return
+  }
+  formData.value.details = formData.value.details || []
+  inventories.forEach((inventory) => {
+    if (isInventorySelected(inventory)) {
+      return
+    }
+    formData.value.details!.push(buildDetail(inventory))
+  })
+  refreshTotalAmount()
+}
+
+/** 判断库存是否已选择 */
+const isInventorySelected = (inventory: InventorySelectRow) => {
+  return (formData.value.details || []).some((detail) => {
+    if (BATCH_ENABLE) {
+      return detail.inventoryDetailId === inventory.inventoryDetailId
+    }
+    return (
+      detail.skuId === inventory.skuId &&
+      detail.warehouseId === inventory.warehouseId &&
+      detail.areaId === inventory.areaId
+    )
+  })
+}
+
+/** 删除明细 */
+const handleDeleteDetail = (index: number) => {
+  formData.value.details?.splice(index, 1)
+  refreshTotalAmount()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  formData.value.areaId = undefined
+  formData.value.details = []
+  refreshTotalAmount()
+}
+
+/** 库区变化 */
+const handleAreaChange = () => {
+  formData.value.details = []
+  refreshTotalAmount()
+}
+
+/** 明细金额变化 */
+const handleDetailAmountChange = () => {
+  refreshTotalAmount()
+}
+
+/** 汇总明细金额 */
+const refreshTotalAmount = () => {
+  formData.value.totalAmount = detailTotalAmount.value
+}
+
+/** 校验明细 */
+const validateDetails = (required: boolean) => {
+  if (!formData.value.details?.length) {
+    if (required) {
+      message.error('至少包含一条出库明细')
+      return false
+    }
+    return true
+  }
+  for (let i = 0; i < formData.value.details.length; i++) {
+    const detail = formData.value.details[i]
+    if (!detail.skuId) {
+      message.error(`第 ${i + 1} 行明细请选择商品规格`)
+      return false
+    }
+    if (AREA_ENABLE && !detail.areaId) {
+      message.error(`第 ${i + 1} 行明细请选择库区`)
+      return false
+    }
+    if (!detail.quantity || detail.quantity <= 0) {
+      message.error(`第 ${i + 1} 行明细出库数量必须大于 0`)
+      return false
+    }
+    if (detail.availableQuantity !== undefined && detail.quantity > detail.availableQuantity) {
+      message.error(`第 ${i + 1} 行明细出库数量不能大于可用库存`)
+      return false
+    }
+  }
+  return true
+}
+
+/** 构建提交数据 */
+const buildSubmitData = () =>
+  ({
+    ...formData.value,
+    totalQuantity: totalQuantity.value,
+    totalAmount: formData.value.totalAmount,
+    details: formData.value.details || []
+  }) as ShipmentOrderVO
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  if (!validateDetails(false)) {
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = buildSubmitData()
+    if (formType.value === 'create') {
+      await ShipmentOrderApi.createShipmentOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ShipmentOrderApi.updateShipmentOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 完成出库：表单修改过则先保存，再完成 */
+const handleComplete = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(true)) {
+    return
+  }
+  try {
+    await message.confirm('确认完成出库？完成后将更新库存。')
+    formLoading.value = true
+    const data = buildSubmitData()
+    if (JSON.stringify(data) !== originalFormData.value) {
+      await ShipmentOrderApi.updateShipmentOrder(data)
+    }
+    await ShipmentOrderApi.completeShipmentOrder(formData.value.id!)
+    message.success('出库成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 作废出库单 */
+const handleCancel = async () => {
+  try {
+    await message.confirm('确认作废该出库单？作废后不可恢复。')
+    formLoading.value = true
+    await ShipmentOrderApi.cancelShipmentOrder(formData.value.id!)
+    message.success('作废成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    no: generateOrderNo('CK'),
+    type: undefined,
+    status: OrderStatusEnum.PREPARE,
+    bizOrderNo: undefined,
+    merchantId: undefined,
+    warehouseId: undefined,
+    areaId: undefined,
+    totalQuantity: 0,
+    totalAmount: 0,
+    remark: undefined,
+    details: []
+  }
+  originalFormData.value = ''
+  nextTick(() => formRef.value?.clearValidate())
+}
+</script>
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
new file mode 100644
index 000000000..ce3e39052
--- /dev/null
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -0,0 +1,128 @@
+<!-- WMS 出库单打印 -->
+<template>
+  <div class="hidden">
+    <button ref="printButtonRef" v-print="printObj" type="button"></button>
+    <div id="wmsShipmentOrderPrint" class="color-#303133">
+      <h2 class="text-center">出库单</h2>
+      <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
+        <div>出库单号：{{ printData.no || '-' }}</div>
+        <div>
+          出库类型：{{ getDictLabel(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE, printData.type) || '-' }}
+        </div>
+        <div>出库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>客户：{{ printData.merchantName || '-' }}</div>
+        <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
+        <div>仓库：{{ printData.warehouseName || '-' }}</div>
+        <div v-if="AREA_ENABLE">库区：{{ printData.areaName || '-' }}</div>
+        <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
+        <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
+        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
+        <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
+      </div>
+      <table class="w-full border-collapse text-13px">
+        <thead>
+          <tr>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
+            <th
+              v-if="AREA_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              库区
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              批号
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              生产日期
+            </th>
+            <th
+              v-if="BATCH_ENABLE"
+              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+            >
+              过期日期
+            </th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="detail in printData.details || []" :key="detail.id">
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.itemName || '-' }}</div>
+              <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.skuName || '-' }}</div>
+              <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
+            </td>
+            <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ detail.areaName || '-' }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ detail.batchNo || '-' }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
+            </td>
+            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatQuantity(detail.quantity) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.amount) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
+          </tr>
+          <tr v-if="!printData.details?.length">
+            <td
+              class="border border-solid border-#dcdfe6 p-8px text-center"
+              :colspan="tableColumnCount"
+            >
+              暂无明细
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+
+/** WMS 出库单打印 */
+defineOptions({ name: 'WmsShipmentOrderPrint' })
+
+const printData = ref<ShipmentOrderVO>({}) // 打印数据
+const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
+const tableColumnCount = computed(() => 5 + (AREA_ENABLE ? 1 : 0) + (BATCH_ENABLE ? 3 : 0))
+const printObj = ref({
+  id: 'wmsShipmentOrderPrint',
+  popTitle: '&nbsp',
+  extraCss: '/print.css',
+  extraHead: '',
+  zIndex: 20003
+})
+
+/** 打印出库单 */
+const print = async (id: number) => {
+  printData.value = await ShipmentOrderApi.getShipmentOrder(id)
+  await nextTick()
+  printButtonRef.value?.click()
+}
+defineExpose({ print })
+</script>
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
new file mode 100644
index 000000000..289405f22
--- /dev/null
+++ b/src/views/wms/order/shipment/index.vue
@@ -0,0 +1,649 @@
+<!-- WMS 出库单 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="80px"
+    >
+      <el-form-item label="出库单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          class="!w-240px"
+          clearable
+          placeholder="请输入出库单号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择单据状态"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect
+          v-model="queryParams.warehouseId"
+          class="!w-240px"
+          @change="handleWarehouseChange"
+        />
+      </el-form-item>
+      <el-form-item label="客户" prop="merchantId">
+        <MerchantSelect
+          v-model="queryParams.merchantId"
+          class="!w-240px"
+          placeholder="请选择客户"
+          customer
+        />
+      </el-form-item>
+      <el-form-item label="单据日期" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="数量" prop="totalQuantityMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalQuantityMin"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalQuantityMax"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="总金额" prop="totalAmountMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalAmountMin"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalAmountMax"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="出库类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          class="!w-240px"
+          clearable
+          placeholder="请选择出库类型"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建用户" prop="creator">
+        <UserSelectV2
+          v-model="queryParams.creator"
+          class="!w-240px"
+          placeholder="请选择创建用户"
+        />
+      </el-form-item>
+      <el-form-item label="更新用户" prop="updater">
+        <UserSelectV2
+          v-model="queryParams.updater"
+          class="!w-240px"
+          placeholder="请选择更新用户"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-popover
+          popper-class="wms-shipment-order-table-setting-popover"
+          trigger="click"
+          width="520"
+        >
+          <template #reference>
+            <el-button>
+              <Icon class="mr-5px" icon="ep:setting" />
+              表格设置
+            </el-button>
+          </template>
+          <el-checkbox-group
+            v-model="checkedTableColumns"
+            class="wms-shipment-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+          >
+            <el-checkbox
+              v-for="column in tableColumnOptions"
+              :key="column.value"
+              :label="column.value"
+            >
+              {{ column.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-popover>
+        <el-button
+          v-hasPermi="['wms:shipment-order:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:shipment-order:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 出库单列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :cell-class-name="'wms-shipment-order-cell'"
+      :data="list"
+      :show-overflow-tooltip="true"
+      border
+      @expand-change="handleExpandChange"
+    >
+      <el-table-column type="expand" width="48">
+        <template #default="scope">
+          <el-table :data="detailMap[scope.row.id] || []" border>
+            <el-table-column label="商品信息" min-width="220">
+              <template #default="detailScope">
+                <div>{{ detailScope.row.itemName || '-' }}</div>
+                <div v-if="detailScope.row.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detailScope.row.itemCode }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格信息" min-width="220">
+              <template #default="detailScope">
+                <div>{{ detailScope.row.skuName || '-' }}</div>
+                <div v-if="detailScope.row.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detailScope.row.skuCode }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="AREA_ENABLE"
+              align="center"
+              label="库区"
+              min-width="140"
+              prop="areaName"
+            />
+            <el-table-column
+              v-if="BATCH_ENABLE"
+              align="center"
+              label="批号"
+              min-width="140"
+              prop="batchNo"
+            />
+            <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+              <template #default="detailScope">
+                <div v-if="detailScope.row.productionDate">
+                  生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
+                </div>
+                <div v-if="detailScope.row.expirationDate">
+                  过期日期：{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="出库数量" width="120">
+              <template #default="detailScope">
+                {{ formatQuantity(detailScope.row.quantity) }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="金额(元)" width="120">
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.amount) || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="160" prop="remark" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="290">
+        <template #default="scope">
+          <div>
+            单号：
+            <el-button link type="primary" @click="openDetail(scope.row.id)">
+              {{ scope.row.no }}
+            </el-button>
+          </div>
+          <div v-if="scope.row.bizOrderNo" class="text-12px text-gray-500">
+            业务：{{ scope.row.bizOrderNo }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('status')"
+        align="center"
+        fixed="left"
+        label="出库状态"
+        width="110"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('type')"
+        align="center"
+        label="出库类型"
+        width="120"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('warehouse')"
+        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        min-width="160"
+      >
+        <template #default="scope">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
+            <div>库区：{{ scope.row.areaName || '-' }}</div>
+          </template>
+          <template v-else>
+            {{ scope.row.warehouseName || '-' }}
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('quantityAmount')"
+        label="总数量/总金额(元)"
+        min-width="180"
+      >
+        <template #default="scope">
+          <div class="flex items-center justify-between">
+            <span>数量：</span>
+            <span>{{ formatQuantity(scope.row.totalQuantity) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(scope.row.totalAmount) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="isTableColumnVisible('merchant')"
+        label="客户"
+        min-width="160"
+        prop="merchantName"
+      />
+      <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
+        <template #default="scope">
+          <div>
+            创建：{{ formatNullableDate(scope.row.createTime) }} /
+            {{ scope.row.creatorName || scope.row.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(scope.row.updateTime) }} /
+            {{ scope.row.updaterName || scope.row.updater || '-' }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column align="center" fixed="right" label="操作" width="180">
+        <template #default="scope">
+          <el-tooltip
+            :content="getShipmentOrderUpdateTip(scope.row.status)"
+            :disabled="canUpdateShipmentOrder(scope.row.status)"
+            placement="top"
+          >
+            <span>
+              <el-button
+                v-hasPermi="['wms:shipment-order:update']"
+                :disabled="!canUpdateShipmentOrder(scope.row.status)"
+                link
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+              >
+                修改
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-tooltip
+            :content="getShipmentOrderDeleteTip(scope.row.status)"
+            :disabled="canDeleteShipmentOrder(scope.row.status)"
+            placement="top"
+          >
+            <span>
+              <el-button
+                v-hasPermi="['wms:shipment-order:delete']"
+                :disabled="!canDeleteShipmentOrder(scope.row.status)"
+                link
+                type="danger"
+                @click="handleDelete(scope.row.id)"
+              >
+                删除
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-button
+            v-hasPermi="['wms:shipment-order:query']"
+            link
+            type="primary"
+            @click="handlePrint(scope.row.id)"
+          >
+            打印
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ShipmentOrderForm ref="formRef" @success="getList" />
+  <ShipmentOrderDetail ref="detailRef" />
+  <ShipmentOrderPrint ref="printRef" />
+</template>
+
+<script lang="ts" setup>
+import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
+import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
+import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList
+} from '@/views/wms/utils/constants'
+import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
+import ShipmentOrderDetail from './ShipmentOrderDetail.vue'
+import ShipmentOrderForm from './ShipmentOrderForm.vue'
+import ShipmentOrderPrint from './ShipmentOrderPrint.vue'
+import download from '@/utils/download'
+
+/** WMS 出库单 */
+defineOptions({ name: 'WmsShipmentOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+type TableColumnKey =
+  | 'no'
+  | 'status'
+  | 'type'
+  | 'warehouse'
+  | 'quantityAmount'
+  | 'merchant'
+  | 'operateInfo'
+  | 'remark'
+
+const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
+  { label: '单号/业务单号', value: 'no' },
+  { label: '出库状态', value: 'status' },
+  { label: '出库类型', value: 'type' },
+  { label: '仓库', value: 'warehouse' },
+  { label: '数量/金额(元)', value: 'quantityAmount' },
+  { label: '客户', value: 'merchant' },
+  { label: '操作信息', value: 'operateInfo' },
+  { label: '备注', value: 'remark' }
+]
+const checkedTableColumns = ref<TableColumnKey[]>([
+  'no',
+  'status',
+  'type',
+  'warehouse',
+  'quantityAmount',
+  'merchant',
+  'operateInfo',
+  'remark'
+])
+const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ShipmentOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined as string | undefined,
+  status: undefined as number | undefined,
+  warehouseId: undefined as number | undefined,
+  merchantId: undefined as number | undefined,
+  orderDate: undefined as string[] | undefined,
+  totalQuantityMin: undefined as number | undefined,
+  totalQuantityMax: undefined as number | undefined,
+  totalAmountMin: undefined as number | undefined,
+  totalAmountMax: undefined as number | undefined,
+  type: undefined as number | undefined,
+  bizOrderNo: undefined as string | undefined,
+  creator: undefined as number | undefined,
+  updater: undefined as number | undefined,
+  createTime: undefined as string[] | undefined,
+  updateTime: undefined as string[] | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const detailMap = reactive<Record<number, ShipmentOrderDetailVO[]>>({}) // 出库单明细缓存
+
+/** 是否允许修改出库单 */
+const canUpdateShipmentOrder = (status?: number) => {
+  return status !== undefined && OrderUpdateStatusList.includes(status)
+}
+
+/** 是否允许删除出库单 */
+const canDeleteShipmentOrder = (status?: number) => {
+  return status !== undefined && OrderDeleteStatusList.includes(status)
+}
+
+/** 获得出库单修改禁用提示 */
+const getShipmentOrderUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已出库，无法修改'
+  }
+  if (status === OrderStatusEnum.CANCELED) {
+    return '已作废，无法修改'
+  }
+  return '当前状态无法修改'
+}
+
+/** 获得出库单删除禁用提示 */
+const getShipmentOrderDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已出库，无法删除'
+  }
+  return '当前状态无法删除'
+}
+
+/** 查询出库单列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ShipmentOrderApi.getShipmentOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  handleQuery()
+}
+
+/** 仓库变化 */
+const handleWarehouseChange = () => {
+  handleQuery()
+}
+
+/** 展开明细 */
+const handleExpandChange = async (row: ShipmentOrderVO) => {
+  if (!row.id || detailMap[row.id]) {
+    return
+  }
+  detailMap[row.id] = await ShipmentOrderApi.getShipmentOrderDetailListByOrderId(row.id)
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 查看出库单详情 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 打印出库单 */
+const printRef = ref()
+const handlePrint = (id: number) => {
+  printRef.value.print(id)
+}
+
+/** 删除出库单 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ShipmentOrderApi.deleteShipmentOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ShipmentOrderApi.exportShipmentOrder(queryParams)
+    download.excel(data, '出库单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style scoped>
+:deep(.wms-shipment-order-cell) {
+  vertical-align: top;
+}
+
+:global(.wms-shipment-order-table-setting-popover) {
+  padding: 12px;
+}
+
+:global(.wms-shipment-order-table-setting) {
+  background-color: var(--el-fill-color-light);
+}
+
+:global(.wms-shipment-order-table-setting .el-checkbox) {
+  height: 28px;
+  margin-right: 0;
+}
+
+:global(.wms-shipment-order-table-setting .el-checkbox__label) {
+  font-size: 16px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/wms/utils/constants.ts b/src/views/wms/utils/constants.ts
index ff922ce07..3a2baf0c7 100644
--- a/src/views/wms/utils/constants.ts
+++ b/src/views/wms/utils/constants.ts
@@ -5,6 +5,12 @@ export const OrderStatusEnum = {
   CANCELED: 5 // 已作废
 } as const
 
+/** 可修改的单据状态 */
+export const OrderUpdateStatusList: number[] = [OrderStatusEnum.PREPARE]
+
+/** 可删除的单据状态 */
+export const OrderDeleteStatusList: number[] = [OrderStatusEnum.PREPARE, OrderStatusEnum.CANCELED]
+
 /** 往来企业类型枚举 */
 export const MerchantTypeEnum = {
   CUSTOMER: 1, // 客户
@@ -17,3 +23,9 @@ export const SupplierMerchantTypeList = [
   MerchantTypeEnum.SUPPLIER,
   MerchantTypeEnum.CUSTOMER_SUPPLIER
 ]
+
+/** 客户类型的往来企业 */
+export const CustomerMerchantTypeList = [
+  MerchantTypeEnum.CUSTOMER,
+  MerchantTypeEnum.CUSTOMER_SUPPLIER
+]

From 70aff05ef5b041118007877bc4fbf5b2a20093eb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 09:47:45 +0800
Subject: [PATCH 17/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E5=BA=93=E3=80=81=E7=9B=98=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/check/detail/index.ts       |  29 ++
 src/api/wms/order/check/index.ts              |  73 +++
 src/api/wms/order/movement/detail/index.ts    |  29 ++
 src/api/wms/order/movement/index.ts           |  77 +++
 .../wms/order/check/CheckOrderDetail.vue      | 107 +++++
 src/views/wms/order/check/CheckOrderForm.vue  | 388 ++++++++++++++++
 src/views/wms/order/check/index.vue           | 284 +++++++++++
 .../order/movement/MovementOrderDetail.vue    | 112 +++++
 .../wms/order/movement/MovementOrderForm.vue  | 439 ++++++++++++++++++
 src/views/wms/order/movement/index.vue        | 287 ++++++++++++
 10 files changed, 1825 insertions(+)
 create mode 100644 src/api/wms/order/check/detail/index.ts
 create mode 100644 src/api/wms/order/check/index.ts
 create mode 100644 src/api/wms/order/movement/detail/index.ts
 create mode 100644 src/api/wms/order/movement/index.ts
 create mode 100644 src/views/wms/order/check/CheckOrderDetail.vue
 create mode 100644 src/views/wms/order/check/CheckOrderForm.vue
 create mode 100644 src/views/wms/order/check/index.vue
 create mode 100644 src/views/wms/order/movement/MovementOrderDetail.vue
 create mode 100644 src/views/wms/order/movement/MovementOrderForm.vue
 create mode 100644 src/views/wms/order/movement/index.vue

diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
new file mode 100644
index 000000000..cc6cc3f5e
--- /dev/null
+++ b/src/api/wms/order/check/detail/index.ts
@@ -0,0 +1,29 @@
+// WMS 盘库单明细 VO
+export interface CheckOrderDetailVO {
+  id?: number
+  orderId?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  inventoryId?: number
+  inventoryDetailId?: number
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  receiptTime?: Date
+  quantity?: number
+  checkQuantity?: number
+  differenceQuantity?: number
+  availableQuantity?: number
+  amount?: number
+  remark?: string
+  createTime?: Date
+}
diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts
new file mode 100644
index 000000000..be3c3dbbd
--- /dev/null
+++ b/src/api/wms/order/check/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+import { CheckOrderDetailVO } from './detail'
+
+// WMS 盘库单 VO
+export interface CheckOrderVO {
+  id?: number
+  no?: string
+  status?: number
+  remark?: string
+  warehouseId?: number
+  warehouseName?: string
+  areaId?: number
+  areaName?: string
+  totalQuantity?: number
+  totalAmount?: number
+  details?: CheckOrderDetailVO[]
+  createTime?: Date
+  creator?: string
+  creatorName?: string
+  updateTime?: Date
+  updater?: string
+  updaterName?: string
+}
+
+// WMS 盘库单 API
+export const CheckOrderApi = {
+  // 查询盘库单分页
+  getCheckOrderPage: async (params: any) => {
+    return await request.get({ url: '/wms/check-order/page', params })
+  },
+
+  // 查询盘库单详情
+  getCheckOrder: async (id: number) => {
+    return await request.get({ url: '/wms/check-order/get?id=' + id })
+  },
+
+  // 查询盘库单明细
+  getCheckOrderDetailListByOrderId: async (orderId: number) => {
+    return await request.get({
+      url: '/wms/check-order-detail/list-by-order-id?orderId=' + orderId
+    })
+  },
+
+  // 新增盘库单
+  createCheckOrder: async (data: CheckOrderVO) => {
+    return await request.post({ url: '/wms/check-order/create', data })
+  },
+
+  // 修改盘库单
+  updateCheckOrder: async (data: CheckOrderVO) => {
+    return await request.put({ url: '/wms/check-order/update', data })
+  },
+
+  // 完成盘库
+  completeCheckOrder: async (id: number) => {
+    return await request.put({ url: '/wms/check-order/complete?id=' + id })
+  },
+
+  // 作废盘库单
+  cancelCheckOrder: async (id: number) => {
+    return await request.put({ url: '/wms/check-order/cancel?id=' + id })
+  },
+
+  // 删除盘库单
+  deleteCheckOrder: async (id: number) => {
+    return await request.delete({ url: '/wms/check-order/delete?id=' + id })
+  },
+
+  // 导出盘库单
+  exportCheckOrder: async (params: any) => {
+    return await request.download({ url: '/wms/check-order/export-excel', params })
+  }
+}
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
new file mode 100644
index 000000000..4c10f3d2d
--- /dev/null
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -0,0 +1,29 @@
+// WMS 移库单明细 VO
+export interface MovementOrderDetailVO {
+  id?: number
+  orderId?: number
+  itemId?: number
+  itemCode?: string
+  itemName?: string
+  unit?: string
+  skuId?: number
+  skuCode?: string
+  skuName?: string
+  inventoryDetailId?: number
+  sourceWarehouseId?: number
+  sourceWarehouseName?: string
+  sourceAreaId?: number
+  sourceAreaName?: string
+  targetWarehouseId?: number
+  targetWarehouseName?: string
+  targetAreaId?: number
+  targetAreaName?: string
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  quantity?: number
+  availableQuantity?: number
+  amount?: number
+  remark?: string
+  createTime?: Date
+}
diff --git a/src/api/wms/order/movement/index.ts b/src/api/wms/order/movement/index.ts
new file mode 100644
index 000000000..b5fcf41a9
--- /dev/null
+++ b/src/api/wms/order/movement/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+import { MovementOrderDetailVO } from './detail'
+
+// WMS 移库单 VO
+export interface MovementOrderVO {
+  id?: number
+  no?: string
+  status?: number
+  remark?: string
+  sourceWarehouseId?: number
+  sourceWarehouseName?: string
+  sourceAreaId?: number
+  sourceAreaName?: string
+  targetWarehouseId?: number
+  targetWarehouseName?: string
+  targetAreaId?: number
+  targetAreaName?: string
+  totalQuantity?: number
+  totalAmount?: number
+  details?: MovementOrderDetailVO[]
+  createTime?: Date
+  creator?: string
+  creatorName?: string
+  updateTime?: Date
+  updater?: string
+  updaterName?: string
+}
+
+// WMS 移库单 API
+export const MovementOrderApi = {
+  // 查询移库单分页
+  getMovementOrderPage: async (params: any) => {
+    return await request.get({ url: '/wms/movement-order/page', params })
+  },
+
+  // 查询移库单详情
+  getMovementOrder: async (id: number) => {
+    return await request.get({ url: '/wms/movement-order/get?id=' + id })
+  },
+
+  // 查询移库单明细
+  getMovementOrderDetailListByOrderId: async (orderId: number) => {
+    return await request.get({
+      url: '/wms/movement-order-detail/list-by-order-id?orderId=' + orderId
+    })
+  },
+
+  // 新增移库单
+  createMovementOrder: async (data: MovementOrderVO) => {
+    return await request.post({ url: '/wms/movement-order/create', data })
+  },
+
+  // 修改移库单
+  updateMovementOrder: async (data: MovementOrderVO) => {
+    return await request.put({ url: '/wms/movement-order/update', data })
+  },
+
+  // 完成移库
+  completeMovementOrder: async (id: number) => {
+    return await request.put({ url: '/wms/movement-order/complete?id=' + id })
+  },
+
+  // 作废移库单
+  cancelMovementOrder: async (id: number) => {
+    return await request.put({ url: '/wms/movement-order/cancel?id=' + id })
+  },
+
+  // 删除移库单
+  deleteMovementOrder: async (id: number) => {
+    return await request.delete({ url: '/wms/movement-order/delete?id=' + id })
+  },
+
+  // 导出移库单
+  exportMovementOrder: async (params: any) => {
+    return await request.download({ url: '/wms/movement-order/export-excel', params })
+  }
+}
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
new file mode 100644
index 000000000..537d3b1c9
--- /dev/null
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -0,0 +1,107 @@
+<!-- WMS 盘库单详情 -->
+<template>
+  <Dialog v-model="dialogVisible" title="盘库单详情" width="1200px">
+    <div v-loading="loading">
+      <div class="mb-16px text-18px font-bold">单据信息</div>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="盘库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
+        <el-descriptions-item v-if="AREA_ENABLE" label="库区">{{ detailData.areaName || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="盈亏数量">
+          {{ formatQuantity(detailData.totalQuantity) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总金额">
+          {{ formatPrice(detailData.totalAmount) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">
+          {{ formatNullableDate(detailData.createTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建人">
+          {{ detailData.creatorName || detailData.creator || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新时间">
+          {{ formatNullableDate(detailData.updateTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新人">
+          {{ detailData.updaterName || detailData.updater || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2" label="备注">{{ detailData.remark || '-' }}</el-descriptions-item>
+      </el-descriptions>
+
+      <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
+      <el-table :data="detailData.details || []" :summary-method="getSummaries" border show-summary>
+        <el-table-column label="商品信息" min-width="200">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="200">
+          <template #default="{ row }">
+            <div>{{ row.skuName || '-' }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column align="right" label="账面数量" prop="quantity" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column align="right" label="实盘数量" prop="checkQuantity" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.checkQuantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column align="right" label="盈亏数量" prop="differenceQuantity" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.differenceQuantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column align="right" label="金额(元)" prop="amount" width="140">
+          <template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
+import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+
+/** WMS 盘库单详情 */
+defineOptions({ name: 'WmsCheckOrderDetail' })
+
+const loading = ref(false)
+const dialogVisible = ref(false)
+const detailData = ref<CheckOrderVO>({})
+
+const getSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderDetailVO[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) return '合计'
+    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
+    if (column.property === 'checkQuantity') return formatSumQuantity(data, (detail) => detail.checkQuantity)
+    if (column.property === 'differenceQuantity') return formatSumQuantity(data, (detail) => detail.differenceQuantity)
+    if (column.property === 'amount') return formatSumPrice(data, (detail) => detail.amount)
+    return ''
+  })
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  loading.value = true
+  try {
+    detailData.value = await CheckOrderApi.getCheckOrder(id)
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open })
+</script>
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
new file mode 100644
index 000000000..cddadf2a3
--- /dev/null
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -0,0 +1,388 @@
+<!-- WMS 盘库单表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="92px">
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="盘库单号" prop="no">
+            <el-input v-model="formData.no" maxlength="64" placeholder="请输入盘库单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="AREA_ENABLE" :span="8">
+          <el-form-item label="库区" prop="areaId">
+            <WarehouseAreaSelect v-model="formData.areaId" :warehouse-id="formData.warehouseId" @change="handleAreaChange" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盈亏数量">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div class="mb-12px flex items-center justify-between">
+        <span class="text-14px font-bold">盘库明细</span>
+        <el-tooltip content="请先选择仓库" :disabled="!!formData.warehouseId" placement="top">
+          <span>
+            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+              <Icon class="mr-5px" icon="ep:plus" />
+              添加商品
+            </el-button>
+          </span>
+        </el-tooltip>
+      </div>
+      <el-table :data="formData.details" border empty-text="暂无商品明细">
+        <el-table-column label="商品信息" min-width="210">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="210">
+          <template #default="{ row }">
+            <div>{{ row.skuName || '-' }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column align="right" label="账面数量" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column label="实盘数量" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.checkQuantity"
+              :controls="false"
+              :min="0"
+              :precision="QUANTITY_PRECISION"
+              class="!w-1/1"
+              placeholder="数量"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="盈亏数量" width="120">
+          <template #default="{ row }">{{ formatQuantity(getDifferenceQuantity(row)) }}</template>
+        </el-table-column>
+        <el-table-column label="金额(元)" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.amount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="金额"
+              @change="refreshTotalAmount"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="160">
+          <template #default="{ row }">
+            <el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="{ $index }">
+            <el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <InventorySelect
+        ref="inventorySelectRef"
+        :area-id="formData.areaId"
+        :warehouse-id="formData.warehouseId"
+        @change="handleSelectInventory"
+      />
+    </el-form>
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:check-order:complete']"
+            :disabled="formLoading"
+            type="success"
+            @click="handleComplete"
+          >
+            完成盘库
+          </el-button>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:check-order:cancel']"
+            :disabled="formLoading"
+            type="danger"
+            @click="handleCancel"
+          >
+            作废
+          </el-button>
+        </div>
+        <div>
+          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">保存</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { FormRules } from 'element-plus'
+import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
+import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
+import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice } from '@/views/wms/utils/format'
+import { generateOrderNo } from '@/views/wms/utils/order'
+
+/** WMS 盘库单表单 */
+defineOptions({ name: 'WmsCheckOrderForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
+const originalFormData = ref('')
+const formData = ref<CheckOrderVO>({
+  id: undefined,
+  no: undefined,
+  status: OrderStatusEnum.PREPARE,
+  warehouseId: undefined,
+  areaId: undefined,
+  totalQuantity: 0,
+  totalAmount: 0,
+  remark: undefined,
+  details: []
+})
+const formRules = reactive<FormRules>({
+  no: [{ required: true, message: '盘库单号不能为空', trigger: 'blur' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+})
+const formRef = ref()
+const inventorySelectRef = ref()
+
+const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const totalQuantity = computed(() =>
+  (formData.value.details || []).reduce((sum, detail) => sum + getDifferenceQuantity(detail), 0)
+)
+const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const isPrepareOrder = computed(
+  () =>
+    !formData.value.id ||
+    (formData.value.status !== undefined && OrderUpdateStatusList.includes(formData.value.status))
+)
+const isSavedPrepareOrder = computed(
+  () =>
+    !!formData.value.id &&
+    formData.value.status !== undefined &&
+    OrderUpdateStatusList.includes(formData.value.status)
+)
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      const order = await CheckOrderApi.getCheckOrder(id)
+      formData.value = { ...order, details: order.details || [] }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  originalFormData.value = JSON.stringify(buildSubmitData())
+}
+defineExpose({ open })
+
+/** 构建盘库明细 */
+const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
+  id: undefined,
+  itemId: inventory.itemId,
+  itemCode: inventory.itemCode,
+  itemName: inventory.itemName,
+  unit: inventory.unit,
+  skuId: inventory.skuId,
+  skuCode: inventory.skuCode,
+  skuName: inventory.skuName,
+  inventoryId: inventory.id,
+  inventoryDetailId: inventory.inventoryDetailId,
+  warehouseId: inventory.warehouseId,
+  warehouseName: inventory.warehouseName,
+  areaId: inventory.areaId,
+  areaName: inventory.areaName,
+  batchNo: inventory.batchNo,
+  productionDate: inventory.productionDate,
+  expirationDate: inventory.expirationDate,
+  quantity: inventory.availableQuantity,
+  checkQuantity: inventory.availableQuantity,
+  availableQuantity: inventory.availableQuantity,
+  amount: inventory.amount,
+  remark: undefined
+})
+
+const handleAddDetail = () => inventorySelectRef.value?.open()
+const handleSelectInventory = (inventories: InventorySelectRow[]) => {
+  if (!inventories.length) return
+  formData.value.details = formData.value.details || []
+  inventories.forEach((inventory) => {
+    if (isInventorySelected(inventory)) return
+    formData.value.details!.push(buildDetail(inventory))
+  })
+  refreshTotalAmount()
+}
+const isInventorySelected = (inventory: InventorySelectRow) =>
+  (formData.value.details || []).some((detail) => {
+    if (BATCH_ENABLE) return detail.inventoryDetailId === inventory.inventoryDetailId
+    return detail.inventoryId === inventory.id
+  })
+const handleDeleteDetail = (index: number) => {
+  formData.value.details?.splice(index, 1)
+  refreshTotalAmount()
+}
+const handleWarehouseChange = () => {
+  formData.value.areaId = undefined
+  formData.value.details = []
+  refreshTotalAmount()
+}
+const handleAreaChange = () => {
+  formData.value.details = []
+  refreshTotalAmount()
+}
+const refreshTotalAmount = () => {
+  formData.value.totalAmount = detailTotalAmount.value
+}
+
+/** 校验明细 */
+const validateDetails = (required: boolean) => {
+  if (!formData.value.details?.length) {
+    if (required) {
+      message.error('至少包含一条盘库明细')
+      return false
+    }
+    return true
+  }
+  for (let i = 0; i < formData.value.details.length; i++) {
+    const detail = formData.value.details[i]
+    if (AREA_ENABLE && !detail.areaId) {
+      message.error(`第 ${i + 1} 行明细请选择库区`)
+      return false
+    }
+    if (detail.checkQuantity === undefined || detail.checkQuantity < 0) {
+      message.error(`第 ${i + 1} 行明细实盘数量不能小于 0`)
+      return false
+    }
+  }
+  return true
+}
+
+/** 构建提交数据 */
+const buildSubmitData = () =>
+  ({
+    ...formData.value,
+    totalQuantity: totalQuantity.value,
+    totalAmount: formData.value.totalAmount,
+    details: formData.value.details || []
+  }) as CheckOrderVO
+
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(false)) return
+  formLoading.value = true
+  try {
+    const data = buildSubmitData()
+    if (formType.value === 'create') {
+      await CheckOrderApi.createCheckOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CheckOrderApi.updateCheckOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 完成盘库：表单修改过则先保存，再完成 */
+const handleComplete = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(true)) return
+  try {
+    await message.confirm('确认完成盘库？完成后将更新库存。')
+    formLoading.value = true
+    const data = buildSubmitData()
+    if (JSON.stringify(data) !== originalFormData.value) {
+      await CheckOrderApi.updateCheckOrder(data)
+    }
+    await CheckOrderApi.completeCheckOrder(formData.value.id!)
+    message.success('盘库成功')
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 作废盘库单 */
+const handleCancel = async () => {
+  try {
+    await message.confirm('确认作废该盘库单？作废后不可恢复。')
+    formLoading.value = true
+    await CheckOrderApi.cancelCheckOrder(formData.value.id!)
+    message.success('作废成功')
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    no: generateOrderNo('PK'),
+    status: OrderStatusEnum.PREPARE,
+    warehouseId: undefined,
+    areaId: undefined,
+    totalQuantity: 0,
+    totalAmount: 0,
+    remark: undefined,
+    details: []
+  }
+  originalFormData.value = ''
+  nextTick(() => formRef.value?.clearValidate())
+}
+</script>
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
new file mode 100644
index 000000000..001571b4c
--- /dev/null
+++ b/src/views/wms/order/check/index.vue
@@ -0,0 +1,284 @@
+<!-- WMS 盘库单 -->
+<template>
+  <ContentWrap>
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="90px">
+      <el-form-item label="盘库单号" prop="no">
+        <el-input v-model="queryParams.no" class="!w-240px" clearable placeholder="请输入盘库单号" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择单据状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" @change="handleWarehouseChange" />
+      </el-form-item>
+      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
+        <WarehouseAreaSelect v-model="queryParams.areaId" :warehouse-id="queryParams.warehouseId" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="单据日期" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="创建用户" prop="creator">
+        <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
+      </el-form-item>
+      <el-form-item label="更新用户" prop="updater">
+        <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['wms:check-order:create']" plain type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:check-order:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :show-overflow-tooltip="true"
+      border
+      @expand-change="handleExpandChange"
+    >
+      <el-table-column type="expand" width="48">
+        <template #default="{ row }">
+          <el-table :data="detailMap[row.id] || []" border>
+            <el-table-column label="商品信息" min-width="220">
+              <template #default="{ row: detail }">
+                <div>{{ detail.itemName || '-' }}</div>
+                <div v-if="detail.itemCode" class="text-12px text-gray-500">商品编号：{{ detail.itemCode }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格信息" min-width="220">
+              <template #default="{ row: detail }">
+                <div>{{ detail.skuName || '-' }}</div>
+                <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column align="right" label="账面数量" width="120">
+              <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
+            </el-table-column>
+            <el-table-column align="right" label="实盘数量" width="120">
+              <template #default="{ row: detail }">{{ formatQuantity(detail.checkQuantity) }}</template>
+            </el-table-column>
+            <el-table-column align="right" label="盈亏数量" width="120">
+              <template #default="{ row: detail }">{{ formatQuantity(detail.differenceQuantity) }}</template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="left" label="单号" width="210">
+        <template #default="{ row }">
+          单号：
+          <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="left" label="盘库状态" width="110">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="AREA_ENABLE ? '仓库/库区' : '仓库'" min-width="180">
+        <template #default="{ row }">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ row.warehouseName || '-' }}</div>
+            <div>库区：{{ row.areaName || '-' }}</div>
+          </template>
+          <template v-else>{{ row.warehouseName || '-' }}</template>
+        </template>
+      </el-table-column>
+      <el-table-column label="盈亏数量/总金额(元)" min-width="180">
+        <template #default="{ row }">
+          <div class="flex items-center justify-between">
+            <span>数量：</span>
+            <span>{{ formatQuantity(row.totalQuantity) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(row.totalAmount) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作信息" min-width="280">
+        <template #default="{ row }">
+          <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
+          <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="160" prop="remark" />
+      <el-table-column align="center" fixed="right" label="操作" width="150">
+        <template #default="{ row }">
+          <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
+            <span>
+              <el-button
+                v-hasPermi="['wms:check-order:update']"
+                :disabled="!canUpdate(row.status)"
+                link
+                type="primary"
+                @click="openForm('update', row.id)"
+              >
+                修改
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-tooltip :content="getDeleteTip(row.status)" :disabled="canDelete(row.status)" placement="top">
+            <span>
+              <el-button
+                v-hasPermi="['wms:check-order:delete']"
+                :disabled="!canDelete(row.status)"
+                link
+                type="danger"
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button>
+            </span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total" @pagination="getList" />
+  </ContentWrap>
+
+  <CheckOrderForm ref="formRef" @success="getList" />
+  <CheckOrderDetail ref="detailRef" />
+</template>
+
+<script lang="ts" setup>
+import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
+import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
+import CheckOrderDetail from './CheckOrderDetail.vue'
+import CheckOrderForm from './CheckOrderForm.vue'
+import download from '@/utils/download'
+
+/** WMS 盘库单 */
+defineOptions({ name: 'WmsCheckOrder' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const loading = ref(true)
+const list = ref<CheckOrderVO[]>([])
+const total = ref(0)
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined as string | undefined,
+  status: undefined as number | undefined,
+  warehouseId: undefined as number | undefined,
+  areaId: undefined as number | undefined,
+  orderDate: undefined as string[] | undefined,
+  creator: undefined as number | undefined,
+  updater: undefined as number | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+const queryFormRef = ref()
+const exportLoading = ref(false)
+const detailMap = reactive<Record<number, CheckOrderDetailVO[]>>({})
+
+const canUpdate = (status?: number) => status !== undefined && OrderUpdateStatusList.includes(status)
+const canDelete = (status?: number) => status !== undefined && OrderDeleteStatusList.includes(status)
+const getUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) return '已盘库，无法修改'
+  if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
+  return '当前状态无法修改'
+}
+const getDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) return '已盘库，无法删除'
+  return '当前状态无法删除'
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CheckOrderApi.getCheckOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  handleQuery()
+}
+const handleWarehouseChange = () => {
+  queryParams.areaId = undefined
+}
+const handleExpandChange = async (row: CheckOrderVO) => {
+  if (!row.id || detailMap[row.id]) return
+  detailMap[row.id] = await CheckOrderApi.getCheckOrderDetailListByOrderId(row.id)
+}
+
+const formRef = ref()
+const openForm = (type: string, id?: number) => formRef.value.open(type, id)
+const detailRef = ref()
+const openDetail = (id: number) => detailRef.value.open(id)
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await CheckOrderApi.deleteCheckOrder(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await CheckOrderApi.exportCheckOrder(queryParams)
+    download.excel(data, '盘库单.xls')
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+onMounted(() => getList())
+</script>
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
new file mode 100644
index 000000000..7f6cc6b64
--- /dev/null
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -0,0 +1,112 @@
+<!-- WMS 移库单详情 -->
+<template>
+  <Dialog v-model="dialogVisible" title="移库单详情" width="1200px">
+    <div v-loading="loading">
+      <div class="mb-16px text-18px font-bold">单据信息</div>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="移库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
+        <el-descriptions-item :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'">
+          <template v-if="AREA_ENABLE">
+            {{ detailData.sourceWarehouseName || '-' }} / {{ detailData.sourceAreaName || '-' }}
+          </template>
+          <template v-else>{{ detailData.sourceWarehouseName || '-' }}</template>
+        </el-descriptions-item>
+        <el-descriptions-item :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'">
+          <template v-if="AREA_ENABLE">
+            {{ detailData.targetWarehouseName || '-' }} / {{ detailData.targetAreaName || '-' }}
+          </template>
+          <template v-else>{{ detailData.targetWarehouseName || '-' }}</template>
+        </el-descriptions-item>
+        <el-descriptions-item label="总数量">
+          {{ formatQuantity(detailData.totalQuantity) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="总金额">
+          {{ formatPrice(detailData.totalAmount) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">
+          {{ formatNullableDate(detailData.createTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建人">
+          {{ detailData.creatorName || detailData.creator || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新时间">
+          {{ formatNullableDate(detailData.updateTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新人">
+          {{ detailData.updaterName || detailData.updater || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2" label="备注">
+          {{ detailData.remark || '-' }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
+      <el-table :data="detailData.details || []" :summary-method="getSummaries" border show-summary>
+        <el-table-column label="商品信息" min-width="200">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="200">
+          <template #default="{ row }">
+            <div>{{ row.skuName || '-' }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column align="right" label="数量" prop="quantity" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column align="right" label="金额(元)" prop="amount" width="140">
+          <template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="160" prop="remark" />
+      </el-table>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
+import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+
+/** WMS 移库单详情 */
+defineOptions({ name: 'WmsMovementOrderDetail' })
+
+const loading = ref(false)
+const dialogVisible = ref(false)
+const detailData = ref<MovementOrderVO>({})
+
+const getSummaries = ({ columns, data }: { columns: any[]; data: MovementOrderDetailVO[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) return '合计'
+    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
+    if (column.property === 'amount') return formatSumPrice(data, (detail) => detail.amount)
+    return ''
+  })
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  loading.value = true
+  try {
+    detailData.value = await MovementOrderApi.getMovementOrder(id)
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open })
+</script>
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
new file mode 100644
index 000000000..94d3194c6
--- /dev/null
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -0,0 +1,439 @@
+<!-- WMS 移库单表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="98px">
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="移库单号" prop="no">
+            <el-input v-model="formData.no" maxlength="64" placeholder="请输入移库单号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="来源仓库" prop="sourceWarehouseId">
+            <WarehouseSelect v-model="formData.sourceWarehouseId" @change="handleSourceWarehouseChange" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="AREA_ENABLE" :span="8">
+          <el-form-item label="来源库区" prop="sourceAreaId">
+            <WarehouseAreaSelect
+              v-model="formData.sourceAreaId"
+              :warehouse-id="formData.sourceWarehouseId"
+              @change="handleSourceAreaChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="目标仓库" prop="targetWarehouseId">
+            <WarehouseSelect v-model="formData.targetWarehouseId" @change="handleTargetWarehouseChange" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="AREA_ENABLE" :span="8">
+          <el-form-item label="目标库区" prop="targetAreaId">
+            <WarehouseAreaSelect
+              v-model="formData.targetAreaId"
+              :warehouse-id="formData.targetWarehouseId"
+              @change="handleTargetAreaChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div class="mb-12px flex items-center justify-between">
+        <span class="text-14px font-bold">移库明细</span>
+        <el-tooltip content="请先选择来源仓库" :disabled="!!formData.sourceWarehouseId" placement="top">
+          <span>
+            <el-button :disabled="!formData.sourceWarehouseId" plain type="primary" @click="handleAddDetail">
+              <Icon class="mr-5px" icon="ep:plus" />
+              添加商品
+            </el-button>
+          </span>
+        </el-tooltip>
+      </div>
+      <el-table :data="formData.details" border empty-text="暂无商品明细">
+        <el-table-column label="商品信息" min-width="210">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="210">
+          <template #default="{ row }">
+            <div>{{ row.skuName || '-' }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="AREA_ENABLE" label="来源库区" min-width="140" prop="sourceAreaName" />
+        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column align="right" label="可用库存" width="120">
+          <template #default="{ row }">{{ formatQuantity(row.availableQuantity) || '-' }}</template>
+        </el-table-column>
+        <el-table-column label="移库数量" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.quantity"
+              :controls="false"
+              :min="0"
+              :precision="QUANTITY_PRECISION"
+              class="!w-1/1"
+              placeholder="数量"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.amount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="金额"
+              @change="refreshTotalAmount"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="160">
+          <template #default="{ row }">
+            <el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="{ $index }">
+            <el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <InventorySelect
+        ref="inventorySelectRef"
+        :area-id="formData.sourceAreaId"
+        :warehouse-id="formData.sourceWarehouseId"
+        @change="handleSelectInventory"
+      />
+    </el-form>
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:movement-order:complete']"
+            :disabled="formLoading"
+            type="success"
+            @click="handleComplete"
+          >
+            完成移库
+          </el-button>
+          <el-button
+            v-if="isSavedPrepareOrder"
+            v-hasPermi="['wms:movement-order:cancel']"
+            :disabled="formLoading"
+            type="danger"
+            @click="handleCancel"
+          >
+            作废
+          </el-button>
+        </div>
+        <div>
+          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">保存</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { FormRules } from 'element-plus'
+import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
+import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
+import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
+import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice, sumQuantity } from '@/views/wms/utils/format'
+import { generateOrderNo } from '@/views/wms/utils/order'
+
+/** WMS 移库单表单 */
+defineOptions({ name: 'WmsMovementOrderForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
+const originalFormData = ref('')
+const formData = ref<MovementOrderVO>({
+  id: undefined,
+  no: undefined,
+  status: OrderStatusEnum.PREPARE,
+  sourceWarehouseId: undefined,
+  sourceAreaId: undefined,
+  targetWarehouseId: undefined,
+  targetAreaId: undefined,
+  totalQuantity: 0,
+  totalAmount: 0,
+  remark: undefined,
+  details: []
+})
+const formRules = reactive<FormRules>({
+  no: [{ required: true, message: '移库单号不能为空', trigger: 'blur' }],
+  sourceWarehouseId: [{ required: true, message: '来源仓库不能为空', trigger: 'change' }],
+  targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }]
+})
+const formRef = ref()
+const inventorySelectRef = ref()
+
+const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
+const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const isPrepareOrder = computed(
+  () =>
+    !formData.value.id ||
+    (formData.value.status !== undefined && OrderUpdateStatusList.includes(formData.value.status))
+)
+const isSavedPrepareOrder = computed(
+  () =>
+    !!formData.value.id &&
+    formData.value.status !== undefined &&
+    OrderUpdateStatusList.includes(formData.value.status)
+)
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      const order = await MovementOrderApi.getMovementOrder(id)
+      formData.value = { ...order, details: order.details || [] }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  originalFormData.value = JSON.stringify(buildSubmitData())
+}
+defineExpose({ open })
+
+/** 构建移库明细 */
+const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
+  id: undefined,
+  itemId: inventory.itemId,
+  itemCode: inventory.itemCode,
+  itemName: inventory.itemName,
+  unit: inventory.unit,
+  skuId: inventory.skuId,
+  skuCode: inventory.skuCode,
+  skuName: inventory.skuName,
+  inventoryDetailId: inventory.inventoryDetailId,
+  sourceWarehouseId: inventory.warehouseId,
+  sourceWarehouseName: inventory.warehouseName,
+  sourceAreaId: inventory.areaId,
+  sourceAreaName: inventory.areaName,
+  targetWarehouseId: formData.value.targetWarehouseId,
+  targetAreaId: formData.value.targetAreaId,
+  batchNo: inventory.batchNo,
+  productionDate: inventory.productionDate,
+  expirationDate: inventory.expirationDate,
+  quantity: undefined,
+  availableQuantity: inventory.availableQuantity,
+  amount: undefined,
+  remark: undefined
+})
+
+const handleAddDetail = () => inventorySelectRef.value?.open()
+
+/** 选择库存 */
+const handleSelectInventory = (inventories: InventorySelectRow[]) => {
+  if (!inventories.length) return
+  formData.value.details = formData.value.details || []
+  inventories.forEach((inventory) => {
+    if (isInventorySelected(inventory)) return
+    formData.value.details!.push(buildDetail(inventory))
+  })
+  refreshTotalAmount()
+}
+
+/** 判断库存是否已选择 */
+const isInventorySelected = (inventory: InventorySelectRow) =>
+  (formData.value.details || []).some((detail) => {
+    if (BATCH_ENABLE) return detail.inventoryDetailId === inventory.inventoryDetailId
+    return (
+      detail.skuId === inventory.skuId &&
+      detail.sourceWarehouseId === inventory.warehouseId &&
+      detail.sourceAreaId === inventory.areaId
+    )
+  })
+
+const handleDeleteDetail = (index: number) => {
+  formData.value.details?.splice(index, 1)
+  refreshTotalAmount()
+}
+
+const handleSourceWarehouseChange = () => {
+  formData.value.sourceAreaId = undefined
+  formData.value.details = []
+  refreshTotalAmount()
+}
+const handleSourceAreaChange = () => {
+  formData.value.details = []
+  refreshTotalAmount()
+}
+const handleTargetWarehouseChange = () => {
+  formData.value.targetAreaId = undefined
+  refreshTargetToDetails()
+}
+const handleTargetAreaChange = () => refreshTargetToDetails()
+const refreshTargetToDetails = () => {
+  const details = formData.value.details || []
+  details.forEach((detail) => {
+    detail.targetWarehouseId = formData.value.targetWarehouseId
+    detail.targetAreaId = formData.value.targetAreaId
+  })
+}
+const refreshTotalAmount = () => {
+  formData.value.totalAmount = detailTotalAmount.value
+}
+
+/** 校验明细 */
+const validateDetails = (required: boolean) => {
+  if (!formData.value.details?.length) {
+    if (required) {
+      message.error('至少包含一条移库明细')
+      return false
+    }
+    return true
+  }
+  if (
+    formData.value.sourceWarehouseId === formData.value.targetWarehouseId &&
+    formData.value.sourceAreaId === formData.value.targetAreaId
+  ) {
+    message.error('来源仓库库区和目标仓库库区不能相同')
+    return false
+  }
+  for (let i = 0; i < formData.value.details.length; i++) {
+    const detail = formData.value.details[i]
+    if (AREA_ENABLE && (!detail.sourceAreaId || !detail.targetAreaId)) {
+      message.error(`第 ${i + 1} 行明细请选择来源和目标库区`)
+      return false
+    }
+    if (!detail.quantity || detail.quantity <= 0) {
+      message.error(`第 ${i + 1} 行明细移库数量必须大于 0`)
+      return false
+    }
+    if (detail.availableQuantity !== undefined && detail.quantity > detail.availableQuantity) {
+      message.error(`第 ${i + 1} 行明细移库数量不能大于可用库存`)
+      return false
+    }
+  }
+  return true
+}
+
+/** 构建提交数据 */
+const buildSubmitData = () =>
+  ({
+    ...formData.value,
+    totalQuantity: totalQuantity.value,
+    totalAmount: formData.value.totalAmount,
+    details: formData.value.details || []
+  }) as MovementOrderVO
+
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(false)) return
+  formLoading.value = true
+  try {
+    const data = buildSubmitData()
+    if (formType.value === 'create') {
+      await MovementOrderApi.createMovementOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MovementOrderApi.updateMovementOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 完成移库：表单修改过则先保存，再完成 */
+const handleComplete = async () => {
+  await formRef.value.validate()
+  if (!validateDetails(true)) return
+  try {
+    await message.confirm('确认完成移库？完成后将更新库存。')
+    formLoading.value = true
+    const data = buildSubmitData()
+    if (JSON.stringify(data) !== originalFormData.value) {
+      await MovementOrderApi.updateMovementOrder(data)
+    }
+    await MovementOrderApi.completeMovementOrder(formData.value.id!)
+    message.success('移库成功')
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 作废移库单 */
+const handleCancel = async () => {
+  try {
+    await message.confirm('确认作废该移库单？作废后不可恢复。')
+    formLoading.value = true
+    await MovementOrderApi.cancelMovementOrder(formData.value.id!)
+    message.success('作废成功')
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    no: generateOrderNo('YK'),
+    status: OrderStatusEnum.PREPARE,
+    sourceWarehouseId: undefined,
+    sourceAreaId: undefined,
+    targetWarehouseId: undefined,
+    targetAreaId: undefined,
+    totalQuantity: 0,
+    totalAmount: 0,
+    remark: undefined,
+    details: []
+  }
+  originalFormData.value = ''
+  nextTick(() => formRef.value?.clearValidate())
+}
+</script>
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
new file mode 100644
index 000000000..4469b2535
--- /dev/null
+++ b/src/views/wms/order/movement/index.vue
@@ -0,0 +1,287 @@
+<!-- WMS 移库单 -->
+<template>
+  <ContentWrap>
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="90px">
+      <el-form-item label="移库单号" prop="no">
+        <el-input v-model="queryParams.no" class="!w-240px" clearable placeholder="请输入移库单号" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择单据状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源仓库" prop="sourceWarehouseId">
+        <WarehouseSelect v-model="queryParams.sourceWarehouseId" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="目标仓库" prop="targetWarehouseId">
+        <WarehouseSelect v-model="queryParams.targetWarehouseId" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="单据日期" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="创建用户" prop="creator">
+        <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
+      </el-form-item>
+      <el-form-item label="更新用户" prop="updater">
+        <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['wms:movement-order:create']" plain type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['wms:movement-order:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :show-overflow-tooltip="true"
+      border
+      @expand-change="handleExpandChange"
+    >
+      <el-table-column type="expand" width="48">
+        <template #default="{ row }">
+          <el-table :data="detailMap[row.id] || []" border>
+            <el-table-column label="商品信息" min-width="220">
+              <template #default="{ row: detail }">
+                <div>{{ detail.itemName || '-' }}</div>
+                <div v-if="detail.itemCode" class="text-12px text-gray-500">商品编号：{{ detail.itemCode }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格信息" min-width="220">
+              <template #default="{ row: detail }">
+                <div>{{ detail.skuName || '-' }}</div>
+                <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column align="right" label="移库数量" width="120">
+              <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
+            </el-table-column>
+            <el-table-column align="right" label="金额(元)" width="120">
+              <template #default="{ row: detail }">{{ formatPrice(detail.amount) || '-' }}</template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="160" prop="remark" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="left" label="单号" width="210">
+        <template #default="{ row }">
+          单号：
+          <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="left" label="移库状态" width="110">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'" min-width="180">
+        <template #default="{ row }">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ row.sourceWarehouseName || '-' }}</div>
+            <div>库区：{{ row.sourceAreaName || '-' }}</div>
+          </template>
+          <template v-else>{{ row.sourceWarehouseName || '-' }}</template>
+        </template>
+      </el-table-column>
+      <el-table-column :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'" min-width="180">
+        <template #default="{ row }">
+          <template v-if="AREA_ENABLE">
+            <div>仓库：{{ row.targetWarehouseName || '-' }}</div>
+            <div>库区：{{ row.targetAreaName || '-' }}</div>
+          </template>
+          <template v-else>{{ row.targetWarehouseName || '-' }}</template>
+        </template>
+      </el-table-column>
+      <el-table-column label="总数量/总金额(元)" min-width="180">
+        <template #default="{ row }">
+          <div class="flex items-center justify-between">
+            <span>数量：</span>
+            <span>{{ formatQuantity(row.totalQuantity) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(row.totalAmount) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作信息" min-width="280">
+        <template #default="{ row }">
+          <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
+          <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="160" prop="remark" />
+      <el-table-column align="center" fixed="right" label="操作" width="150">
+        <template #default="{ row }">
+          <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
+            <span>
+              <el-button
+                v-hasPermi="['wms:movement-order:update']"
+                :disabled="!canUpdate(row.status)"
+                link
+                type="primary"
+                @click="openForm('update', row.id)"
+              >
+                修改
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-tooltip :content="getDeleteTip(row.status)" :disabled="canDelete(row.status)" placement="top">
+            <span>
+              <el-button
+                v-hasPermi="['wms:movement-order:delete']"
+                :disabled="!canDelete(row.status)"
+                link
+                type="danger"
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button>
+            </span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total" @pagination="getList" />
+  </ContentWrap>
+
+  <MovementOrderForm ref="formRef" @success="getList" />
+  <MovementOrderDetail ref="detailRef" />
+</template>
+
+<script lang="ts" setup>
+import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
+import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
+import MovementOrderDetail from './MovementOrderDetail.vue'
+import MovementOrderForm from './MovementOrderForm.vue'
+import download from '@/utils/download'
+
+/** WMS 移库单 */
+defineOptions({ name: 'WmsMovementOrder' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const loading = ref(true)
+const list = ref<MovementOrderVO[]>([])
+const total = ref(0)
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined as string | undefined,
+  status: undefined as number | undefined,
+  sourceWarehouseId: undefined as number | undefined,
+  targetWarehouseId: undefined as number | undefined,
+  orderDate: undefined as string[] | undefined,
+  creator: undefined as number | undefined,
+  updater: undefined as number | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+const queryFormRef = ref()
+const exportLoading = ref(false)
+const detailMap = reactive<Record<number, MovementOrderDetailVO[]>>({})
+
+const canUpdate = (status?: number) => status !== undefined && OrderUpdateStatusList.includes(status)
+const canDelete = (status?: number) => status !== undefined && OrderDeleteStatusList.includes(status)
+const getUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) return '已移库，无法修改'
+  if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
+  return '当前状态无法修改'
+}
+const getDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) return '已移库，无法删除'
+  return '当前状态无法删除'
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MovementOrderApi.getMovementOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  handleQuery()
+}
+const handleExpandChange = async (row: MovementOrderVO) => {
+  if (!row.id || detailMap[row.id]) return
+  detailMap[row.id] = await MovementOrderApi.getMovementOrderDetailListByOrderId(row.id)
+}
+
+const formRef = ref()
+const openForm = (type: string, id?: number) => formRef.value.open(type, id)
+const detailRef = ref()
+const openDetail = (id: number) => detailRef.value.open(id)
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await MovementOrderApi.deleteMovementOrder(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await MovementOrderApi.exportMovementOrder(queryParams)
+    download.excel(data, '移库单.xls')
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+onMounted(() => getList())
+</script>

From c5948d405e95be0db6388db25cc617966013bba2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 18:42:51 +0800
Subject: [PATCH 18/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=87=8F=E6=B3=95=EF=BC=8C=E5=8E=BB=E6=8E=89=20detail=20?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=92=8C=20mes=20=E6=9B=B4=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/detail/index.ts         |  36 --
 src/api/wms/order/check/detail/index.ts       |   1 -
 src/api/wms/order/movement/detail/index.ts    |   1 -
 src/api/wms/order/shipment/detail/index.ts    |   1 -
 src/views/wms/inventory/detail/index.vue      | 400 ------------------
 src/views/wms/inventory/history/index.vue     |  16 +-
 .../wms/order/check/CheckOrderDetail.vue      |   4 +-
 src/views/wms/order/check/CheckOrderForm.vue  |   6 +-
 src/views/wms/order/check/index.vue           | 161 ++++++-
 .../order/movement/MovementOrderDetail.vue    |   4 +-
 .../wms/order/movement/MovementOrderForm.vue  |   6 +-
 src/views/wms/order/movement/index.vue        | 176 +++++++-
 .../wms/order/receipt/ReceiptOrderDetail.vue  |   8 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    |   8 +-
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  13 +-
 src/views/wms/order/receipt/index.vue         |  12 +-
 .../order/shipment/ShipmentOrderDetail.vue    |   8 +-
 .../wms/order/shipment/ShipmentOrderForm.vue  |  12 +-
 .../wms/order/shipment/ShipmentOrderPrint.vue |  13 +-
 src/views/wms/order/shipment/index.vue        |  12 +-
 src/views/wms/utils/config.ts                 |   7 -
 21 files changed, 360 insertions(+), 545 deletions(-)
 delete mode 100644 src/api/wms/inventory/detail/index.ts
 delete mode 100644 src/views/wms/inventory/detail/index.vue

diff --git a/src/api/wms/inventory/detail/index.ts b/src/api/wms/inventory/detail/index.ts
deleted file mode 100644
index d34dc613a..000000000
--- a/src/api/wms/inventory/detail/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import request from '@/config/axios'
-
-// WMS 库存明细 VO
-export interface InventoryDetailVO {
-  id?: number
-  itemId?: number
-  itemCode?: string
-  itemName?: string
-  unit?: string
-  skuId?: number
-  skuCode?: string
-  skuName?: string
-  warehouseId?: number
-  warehouseName?: string
-  areaId?: number
-  areaName?: string
-  quantity?: number
-  remainQuantity?: number
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
-  amount?: number
-  remark?: string
-  orderId?: number
-  orderNo?: string
-  orderType?: number
-  createTime?: Date
-}
-
-// WMS 库存明细 API
-export const InventoryDetailApi = {
-  // 查询库存明细分页
-  getInventoryDetailPage: async (params: any) => {
-    return await request.get({ url: '/wms/inventory-detail/page', params })
-  }
-}
diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index cc6cc3f5e..9c1f679ff 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -10,7 +10,6 @@ export interface CheckOrderDetailVO {
   skuCode?: string
   skuName?: string
   inventoryId?: number
-  inventoryDetailId?: number
   warehouseId?: number
   warehouseName?: string
   areaId?: number
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index 4c10f3d2d..b38be4f34 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -9,7 +9,6 @@ export interface MovementOrderDetailVO {
   skuId?: number
   skuCode?: string
   skuName?: string
-  inventoryDetailId?: number
   sourceWarehouseId?: number
   sourceWarehouseName?: string
   sourceAreaId?: number
diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 52017fef4..1ceaf25e4 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -9,7 +9,6 @@ export interface ShipmentOrderDetailVO {
   skuId?: number
   skuCode?: string
   skuName?: string
-  inventoryDetailId?: number
   warehouseId?: number
   warehouseName?: string
   areaId?: number
diff --git a/src/views/wms/inventory/detail/index.vue b/src/views/wms/inventory/detail/index.vue
deleted file mode 100644
index 5df1470a7..000000000
--- a/src/views/wms/inventory/detail/index.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-<!-- WMS 库存明细 -->
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      ref="queryFormRef"
-      :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
-      label-width="68px"
-    >
-      <el-form-item label="统计维度" prop="type">
-        <el-radio-group v-model="queryParams.type" class="!w-240px" @change="handleTypeChange">
-          <el-radio-button
-            v-for="item in detailDimensionOptions"
-            :key="item.value"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="商品编号" prop="itemCode">
-        <el-input
-          v-model="queryParams.itemCode"
-          class="!w-240px"
-          clearable
-          placeholder="请输入商品编号"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商品名称" prop="itemName">
-        <el-input
-          v-model="queryParams.itemName"
-          class="!w-240px"
-          clearable
-          placeholder="请输入商品名称"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId">
-        <WarehouseSelect
-          v-model="queryParams.warehouseId"
-          class="!w-240px"
-          @change="handleWarehouseChange"
-        />
-      </el-form-item>
-      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
-        <WarehouseAreaSelect
-          v-model="queryParams.areaId"
-          :warehouse-id="queryParams.warehouseId"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="规格编号" prop="skuCode">
-        <el-input
-          v-model="queryParams.skuCode"
-          class="!w-240px"
-          clearable
-          placeholder="请输入规格编号"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格名称" prop="skuName">
-        <el-input
-          v-model="queryParams.skuName"
-          class="!w-240px"
-          clearable
-          placeholder="请输入规格名称"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item v-if="BATCH_ENABLE" label="批号" prop="batchNo">
-        <el-input
-          v-model="queryParams.batchNo"
-          class="!w-240px"
-          clearable
-          placeholder="请输入批号"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item v-if="BATCH_ENABLE" label="过期" prop="daysToExpires">
-        <el-select
-          v-model="queryParams.daysToExpires"
-          class="!w-240px"
-          clearable
-          placeholder="请选择过期时间"
-        >
-          <el-option
-            v-for="item in expirationDayOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入库日期" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          :shortcuts="defaultShortcuts"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon class="mr-5px" icon="ep:search" />
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 库存明细列表 -->
-  <ContentWrap>
-    <div class="mb-12px text-16px font-500">库存明细</div>
-    <el-table
-      v-loading="loading"
-      :cell-class-name="'wms-inventory-detail-cell'"
-      :data="list"
-      :show-overflow-tooltip="true"
-      :span-method="spanMethod"
-      border
-    >
-      <template v-if="queryParams.type === INVENTORY_DETAIL_DIMENSION.WAREHOUSE">
-        <el-table-column label="仓库" min-width="160" prop="warehouseId">
-          <template #default="scope">
-            {{ scope.row.warehouseName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="160" prop="areaId">
-          <template #default="scope">
-            {{ scope.row.areaName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="商品信息"
-          min-width="240"
-          :prop="AREA_ENABLE ? 'areaItemId' : 'warehouseItemId'"
-        >
-          <template #default="scope">
-            <div>{{ scope.row.itemName || '-' }}</div>
-            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
-              商品编号：{{ scope.row.itemCode }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="规格信息"
-          min-width="220"
-          :prop="AREA_ENABLE ? 'areaSkuId' : 'warehouseSkuId'"
-        >
-          <template #default="scope">
-            <div>{{ scope.row.skuName || '-' }}</div>
-            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
-              规格编号：{{ scope.row.skuCode }}
-            </div>
-          </template>
-        </el-table-column>
-      </template>
-      <template v-else>
-        <el-table-column label="商品信息" min-width="240" prop="itemId">
-          <template #default="scope">
-            <div>{{ scope.row.itemName || '-' }}</div>
-            <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
-              商品编号：{{ scope.row.itemCode }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="规格信息" min-width="220" prop="skuId">
-          <template #default="scope">
-            <div>{{ scope.row.skuName || '-' }}</div>
-            <div v-if="scope.row.skuCode" class="text-12px text-gray-500">
-              规格编号：{{ scope.row.skuCode }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库" min-width="160" prop="skuWarehouseId">
-          <template #default="scope">
-            {{ scope.row.warehouseName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="所属库区" min-width="160" prop="skuAreaId">
-          <template #default="scope">
-            {{ scope.row.areaName || '-' }}
-          </template>
-        </el-table-column>
-      </template>
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="入库日期"
-        prop="createTime"
-        width="180"
-      />
-      <el-table-column align="right" label="库存" min-width="120">
-        <template #default="scope">
-          <div>剩余：{{ formatQuantity(scope.row.remainQuantity) }}</div>
-          <div class="text-12px text-gray-500">原始：{{ formatQuantity(scope.row.quantity) }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="BATCH_ENABLE"
-        align="center"
-        label="批号"
-        min-width="140"
-        prop="batchNo"
-      />
-      <el-table-column
-        v-if="BATCH_ENABLE"
-        align="left"
-        label="生产日期/过期日期"
-        min-width="180"
-      >
-        <template #default="scope">
-          <div v-if="scope.row.productionDate">
-            生产日期：{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-          </div>
-          <div v-if="scope.row.expirationDate">
-            过期日期：{{ formatDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-  </ContentWrap>
-</template>
-
-<script lang="ts" setup>
-import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime'
-import { InventoryDetailApi, InventoryDetailVO } from '@/api/wms/inventory/detail'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
-import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
-import { formatQuantity } from '@/views/wms/utils/format'
-
-/** WMS 库存明细 */
-defineOptions({ name: 'WmsInventoryDetail' })
-
-const INVENTORY_DETAIL_DIMENSION = {
-  WAREHOUSE: 'warehouse',
-  ITEM: 'item'
-} as const
-type InventoryDetailDimension =
-  (typeof INVENTORY_DETAIL_DIMENSION)[keyof typeof INVENTORY_DETAIL_DIMENSION]
-
-const detailDimensionOptions = [
-  { label: '仓库库区', value: INVENTORY_DETAIL_DIMENSION.WAREHOUSE },
-  { label: '商品', value: INVENTORY_DETAIL_DIMENSION.ITEM }
-]
-const expirationDayOptions = [
-  { label: '30天内', value: 30 },
-  { label: '60天内', value: 60 },
-  { label: '90天内', value: 90 },
-  { label: '120天内', value: 120 },
-  { label: '180天内', value: 180 },
-  { label: '365天内', value: 365 }
-]
-
-interface InventoryDetailRow extends InventoryDetailVO {
-  warehouseItemId?: string
-  warehouseSkuId?: string
-  areaItemId?: string
-  areaSkuId?: string
-  skuWarehouseId?: string
-  skuAreaId?: string
-}
-
-interface SpanMethodProps {
-  column: {
-    property?: string
-  }
-  rowIndex: number
-}
-
-const loading = ref(true) // 列表的加载中
-const list = ref<InventoryDetailRow[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  type: INVENTORY_DETAIL_DIMENSION.WAREHOUSE as InventoryDetailDimension,
-  itemCode: undefined as string | undefined,
-  itemName: undefined as string | undefined,
-  skuCode: undefined as string | undefined,
-  skuName: undefined as string | undefined,
-  warehouseId: undefined as number | undefined,
-  areaId: undefined as number | undefined,
-  batchNo: undefined as string | undefined,
-  daysToExpires: undefined as number | undefined,
-  createTime: [] as string[]
-})
-const queryFormRef = ref() // 搜索的表单
-
-/** 查询库存明细列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await InventoryDetailApi.getInventoryDetailPage(queryParams)
-    list.value = data.list.map((item: InventoryDetailVO) => ({
-      ...item,
-      // 展示字段
-      warehouseItemId: `${item.warehouseId || 0}-${item.itemId || 0}`,
-      warehouseSkuId: `${item.warehouseId || 0}-${item.skuId || 0}`,
-      areaItemId: `${item.warehouseId || 0}-${item.areaId || 0}-${item.itemId || 0}`,
-      areaSkuId: `${item.warehouseId || 0}-${item.areaId || 0}-${item.skuId || 0}`,
-      skuWarehouseId: `${item.skuId || 0}-${item.warehouseId || 0}`,
-      skuAreaId: `${item.skuId || 0}-${item.warehouseId || 0}-${item.areaId || 0}`
-    }))
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  queryParams.type = INVENTORY_DETAIL_DIMENSION.WAREHOUSE
-  handleQuery()
-}
-
-/** 统计维度变化 */
-const handleTypeChange = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 仓库变化 */
-const handleWarehouseChange = () => {
-  queryParams.areaId = undefined
-}
-
-/** 合并库存明细的维度单元格 */
-const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
-  const property = column.property
-  if (!property || !getRowSpanProperties().includes(property)) {
-    return { rowspan: 1, colspan: 1 }
-  }
-  const row = list.value[rowIndex]
-  if (
-    rowIndex > 0 &&
-    getRowPropertyValue(list.value[rowIndex - 1], property) === getRowPropertyValue(row, property)
-  ) {
-    return { rowspan: 0, colspan: 0 }
-  }
-  let rowspan = 1
-  for (let index = rowIndex + 1; index < list.value.length; index++) {
-    if (getRowPropertyValue(list.value[index], property) !== getRowPropertyValue(row, property)) {
-      break
-    }
-    rowspan++
-  }
-  return { rowspan, colspan: 1 }
-}
-
-const getRowPropertyValue = (row: InventoryDetailRow | undefined, property: string) => {
-  return row?.[property as keyof InventoryDetailRow]
-}
-
-const getRowSpanProperties = () => {
-  if (queryParams.type === INVENTORY_DETAIL_DIMENSION.ITEM) {
-    return ['itemId', 'skuId', 'skuWarehouseId', 'skuAreaId']
-  }
-  return AREA_ENABLE
-    ? ['warehouseId', 'areaId', 'areaItemId', 'areaSkuId']
-    : ['warehouseId', 'warehouseItemId', 'warehouseSkuId']
-}
-
-/** 初始化 */
-onMounted(async () => {
-  await getList()
-})
-</script>
-
-<style scoped>
-:deep(.wms-inventory-detail-cell) {
-  vertical-align: top;
-}
-</style>
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index 8cd5fcbbc..fdf017bab 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -151,12 +151,12 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作前" min-width="110">
+      <el-table-column align="right" label="操作前" min-width="110">
         <template #default="scope">
           {{ formatQuantity(scope.row.beforeQuantity) || '-' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="!BATCH_ENABLE" align="right" label="操作后" min-width="110">
+      <el-table-column align="right" label="操作后" min-width="110">
         <template #default="scope">
           {{ formatQuantity(scope.row.afterQuantity) || '-' }}
         </template>
@@ -173,14 +173,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="BATCH_ENABLE"
-        align="center"
-        label="批号"
-        min-width="140"
-        prop="batchNo"
-      />
-      <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+      <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
+      <el-table-column label="生产日期/过期日期" min-width="180">
         <template #default="scope">
           <div v-if="scope.row.productionDate">
             生产日期：{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
@@ -215,7 +209,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/history'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存流水 */
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 537d3b1c9..2bde086e3 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -50,7 +50,7 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="账面数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
@@ -73,7 +73,7 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 盘库单详情 */
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index cddadf2a3..98630b782 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -66,7 +66,7 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="账面数量" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
@@ -154,7 +154,7 @@ import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
@@ -235,7 +235,6 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
   skuCode: inventory.skuCode,
   skuName: inventory.skuName,
   inventoryId: inventory.id,
-  inventoryDetailId: inventory.inventoryDetailId,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
   areaId: inventory.areaId,
@@ -262,7 +261,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
 }
 const isInventorySelected = (inventory: InventorySelectRow) =>
   (formData.value.details || []).some((detail) => {
-    if (BATCH_ENABLE) return detail.inventoryDetailId === inventory.inventoryDetailId
     return detail.inventoryId === inventory.id
   })
 const handleDeleteDetail = (index: number) => {
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 001571b4c..ac4742892 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -32,12 +32,74 @@
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
+      <el-form-item label="盈亏数量" prop="totalQuantityMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalQuantityMin"
+            :controls="false"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalQuantityMax"
+            :controls="false"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="总金额" prop="totalAmountMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalAmountMin"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalAmountMax"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
       <el-form-item label="创建用户" prop="creator">
         <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
       </el-form-item>
       <el-form-item label="更新用户" prop="updater">
         <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -47,6 +109,22 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
+        <el-popover popper-class="wms-check-order-table-setting-popover" trigger="click" width="520">
+          <template #reference>
+            <el-button>
+              <Icon class="mr-5px" icon="ep:setting" />
+              表格设置
+            </el-button>
+          </template>
+          <el-checkbox-group
+            v-model="checkedTableColumns"
+            class="wms-check-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+          >
+            <el-checkbox v-for="column in tableColumnOptions" :key="column.value" :label="column.value">
+              {{ column.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-popover>
         <el-button v-hasPermi="['wms:check-order:create']" plain type="primary" @click="openForm('create')">
           <Icon class="mr-5px" icon="ep:plus" />
           新增
@@ -68,6 +146,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
+      :cell-class-name="'wms-check-order-cell'"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -88,7 +167,7 @@
                 <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
               </template>
             </el-table-column>
-            <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column label="批号" min-width="140" prop="batchNo" />
             <el-table-column align="right" label="账面数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
@@ -101,18 +180,28 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column fixed="left" label="单号" width="210">
+      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号" width="210">
         <template #default="{ row }">
           单号：
           <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" fixed="left" label="盘库状态" width="110">
+      <el-table-column
+        v-if="isTableColumnVisible('status')"
+        align="center"
+        fixed="left"
+        label="盘库状态"
+        width="110"
+      >
         <template #default="{ row }">
           <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column :label="AREA_ENABLE ? '仓库/库区' : '仓库'" min-width="180">
+      <el-table-column
+        v-if="isTableColumnVisible('warehouse')"
+        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        min-width="180"
+      >
         <template #default="{ row }">
           <template v-if="AREA_ENABLE">
             <div>仓库：{{ row.warehouseName || '-' }}</div>
@@ -121,10 +210,10 @@
           <template v-else>{{ row.warehouseName || '-' }}</template>
         </template>
       </el-table-column>
-      <el-table-column label="盈亏数量/总金额(元)" min-width="180">
+      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="盈亏数量/总金额(元)" min-width="180">
         <template #default="{ row }">
           <div class="flex items-center justify-between">
-            <span>数量：</span>
+            <span>盈亏：</span>
             <span>{{ formatQuantity(row.totalQuantity) }}</span>
           </div>
           <div class="flex items-center justify-between">
@@ -133,13 +222,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作信息" min-width="280">
+      <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
           <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
           <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="160" prop="remark" />
+      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
       <el-table-column align="center" fixed="right" label="操作" width="150">
         <template #default="{ row }">
           <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
@@ -185,9 +274,9 @@ import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import CheckOrderDetail from './CheckOrderDetail.vue'
 import CheckOrderForm from './CheckOrderForm.vue'
@@ -199,6 +288,26 @@ defineOptions({ name: 'WmsCheckOrder' })
 const message = useMessage()
 const { t } = useI18n()
 
+type TableColumnKey = 'no' | 'status' | 'warehouse' | 'quantityAmount' | 'operateInfo' | 'remark'
+
+const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
+  { label: '单号', value: 'no' },
+  { label: '盘库状态', value: 'status' },
+  { label: '仓库', value: 'warehouse' },
+  { label: '盈亏/金额(元)', value: 'quantityAmount' },
+  { label: '操作信息', value: 'operateInfo' },
+  { label: '备注', value: 'remark' }
+]
+const checkedTableColumns = ref<TableColumnKey[]>([
+  'no',
+  'status',
+  'warehouse',
+  'quantityAmount',
+  'operateInfo',
+  'remark'
+])
+const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
+
 const loading = ref(true)
 const list = ref<CheckOrderVO[]>([])
 const total = ref(0)
@@ -210,8 +319,14 @@ const getDefaultQueryParams = () => ({
   warehouseId: undefined as number | undefined,
   areaId: undefined as number | undefined,
   orderDate: undefined as string[] | undefined,
+  totalQuantityMin: undefined as number | undefined,
+  totalQuantityMax: undefined as number | undefined,
+  totalAmountMin: undefined as number | undefined,
+  totalAmountMax: undefined as number | undefined,
   creator: undefined as number | undefined,
-  updater: undefined as number | undefined
+  updater: undefined as number | undefined,
+  createTime: undefined as string[] | undefined,
+  updateTime: undefined as string[] | undefined
 })
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref()
@@ -282,3 +397,27 @@ const handleExport = async () => {
 
 onMounted(() => getList())
 </script>
+
+<style scoped>
+:deep(.wms-check-order-cell) {
+  vertical-align: top;
+}
+
+:global(.wms-check-order-table-setting-popover) {
+  padding: 12px;
+}
+
+:global(.wms-check-order-table-setting) {
+  background-color: var(--el-fill-color-light);
+}
+
+:global(.wms-check-order-table-setting .el-checkbox) {
+  height: 28px;
+  margin-right: 0;
+}
+
+:global(.wms-check-order-table-setting .el-checkbox__label) {
+  font-size: 16px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 7f6cc6b64..7f1184392 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -62,7 +62,7 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
@@ -80,7 +80,7 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 移库单详情 */
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 94d3194c6..9a827f2ec 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -85,7 +85,7 @@
           </template>
         </el-table-column>
         <el-table-column v-if="AREA_ENABLE" label="来源库区" min-width="140" prop="sourceAreaName" />
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="可用库存" width="120">
           <template #default="{ row }">{{ formatQuantity(row.availableQuantity) || '-' }}</template>
         </el-table-column>
@@ -170,7 +170,7 @@ import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice, sumQuantity } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
@@ -250,7 +250,6 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
   skuId: inventory.skuId,
   skuCode: inventory.skuCode,
   skuName: inventory.skuName,
-  inventoryDetailId: inventory.inventoryDetailId,
   sourceWarehouseId: inventory.warehouseId,
   sourceWarehouseName: inventory.warehouseName,
   sourceAreaId: inventory.areaId,
@@ -282,7 +281,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
 /** 判断库存是否已选择 */
 const isInventorySelected = (inventory: InventorySelectRow) =>
   (formData.value.details || []).some((detail) => {
-    if (BATCH_ENABLE) return detail.inventoryDetailId === inventory.inventoryDetailId
     return (
       detail.skuId === inventory.skuId &&
       detail.sourceWarehouseId === inventory.warehouseId &&
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 4469b2535..3c27f4c87 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -32,12 +32,76 @@
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
+      <el-form-item label="数量" prop="totalQuantityMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalQuantityMin"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalQuantityMax"
+            :controls="false"
+            :min="0"
+            :precision="QUANTITY_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="总金额" prop="totalAmountMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.totalAmountMin"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.totalAmountMax"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
       <el-form-item label="创建用户" prop="creator">
         <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
       </el-form-item>
       <el-form-item label="更新用户" prop="updater">
         <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束时间"
+          start-placeholder="开始时间"
+          type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -47,6 +111,22 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
+        <el-popover popper-class="wms-movement-order-table-setting-popover" trigger="click" width="520">
+          <template #reference>
+            <el-button>
+              <Icon class="mr-5px" icon="ep:setting" />
+              表格设置
+            </el-button>
+          </template>
+          <el-checkbox-group
+            v-model="checkedTableColumns"
+            class="wms-movement-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+          >
+            <el-checkbox v-for="column in tableColumnOptions" :key="column.value" :label="column.value">
+              {{ column.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-popover>
         <el-button v-hasPermi="['wms:movement-order:create']" plain type="primary" @click="openForm('create')">
           <Icon class="mr-5px" icon="ep:plus" />
           新增
@@ -68,6 +148,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
+      :cell-class-name="'wms-movement-order-cell'"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -88,7 +169,7 @@
                 <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
               </template>
             </el-table-column>
-            <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column label="批号" min-width="140" prop="batchNo" />
             <el-table-column align="right" label="移库数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
@@ -99,18 +180,28 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column fixed="left" label="单号" width="210">
+      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号" width="210">
         <template #default="{ row }">
           单号：
           <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" fixed="left" label="移库状态" width="110">
+      <el-table-column
+        v-if="isTableColumnVisible('status')"
+        align="center"
+        fixed="left"
+        label="移库状态"
+        width="110"
+      >
         <template #default="{ row }">
           <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'" min-width="180">
+      <el-table-column
+        v-if="isTableColumnVisible('sourceWarehouse')"
+        :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'"
+        min-width="180"
+      >
         <template #default="{ row }">
           <template v-if="AREA_ENABLE">
             <div>仓库：{{ row.sourceWarehouseName || '-' }}</div>
@@ -119,7 +210,11 @@
           <template v-else>{{ row.sourceWarehouseName || '-' }}</template>
         </template>
       </el-table-column>
-      <el-table-column :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'" min-width="180">
+      <el-table-column
+        v-if="isTableColumnVisible('targetWarehouse')"
+        :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'"
+        min-width="180"
+      >
         <template #default="{ row }">
           <template v-if="AREA_ENABLE">
             <div>仓库：{{ row.targetWarehouseName || '-' }}</div>
@@ -128,7 +223,7 @@
           <template v-else>{{ row.targetWarehouseName || '-' }}</template>
         </template>
       </el-table-column>
-      <el-table-column label="总数量/总金额(元)" min-width="180">
+      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="总数量/总金额(元)" min-width="180">
         <template #default="{ row }">
           <div class="flex items-center justify-between">
             <span>数量：</span>
@@ -140,13 +235,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作信息" min-width="280">
+      <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
           <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
           <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="160" prop="remark" />
+      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
       <el-table-column align="center" fixed="right" label="操作" width="150">
         <template #default="{ row }">
           <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
@@ -191,9 +286,9 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import MovementOrderDetail from './MovementOrderDetail.vue'
 import MovementOrderForm from './MovementOrderForm.vue'
@@ -205,6 +300,35 @@ defineOptions({ name: 'WmsMovementOrder' })
 const message = useMessage()
 const { t } = useI18n()
 
+type TableColumnKey =
+  | 'no'
+  | 'status'
+  | 'sourceWarehouse'
+  | 'targetWarehouse'
+  | 'quantityAmount'
+  | 'operateInfo'
+  | 'remark'
+
+const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
+  { label: '单号', value: 'no' },
+  { label: '移库状态', value: 'status' },
+  { label: '来源仓库', value: 'sourceWarehouse' },
+  { label: '目标仓库', value: 'targetWarehouse' },
+  { label: '数量/金额(元)', value: 'quantityAmount' },
+  { label: '操作信息', value: 'operateInfo' },
+  { label: '备注', value: 'remark' }
+]
+const checkedTableColumns = ref<TableColumnKey[]>([
+  'no',
+  'status',
+  'sourceWarehouse',
+  'targetWarehouse',
+  'quantityAmount',
+  'operateInfo',
+  'remark'
+])
+const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
+
 const loading = ref(true)
 const list = ref<MovementOrderVO[]>([])
 const total = ref(0)
@@ -216,8 +340,14 @@ const getDefaultQueryParams = () => ({
   sourceWarehouseId: undefined as number | undefined,
   targetWarehouseId: undefined as number | undefined,
   orderDate: undefined as string[] | undefined,
+  totalQuantityMin: undefined as number | undefined,
+  totalQuantityMax: undefined as number | undefined,
+  totalAmountMin: undefined as number | undefined,
+  totalAmountMax: undefined as number | undefined,
   creator: undefined as number | undefined,
-  updater: undefined as number | undefined
+  updater: undefined as number | undefined,
+  createTime: undefined as string[] | undefined,
+  updateTime: undefined as string[] | undefined
 })
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref()
@@ -285,3 +415,27 @@ const handleExport = async () => {
 
 onMounted(() => getList())
 </script>
+
+<style scoped>
+:deep(.wms-movement-order-cell) {
+  vertical-align: top;
+}
+
+:global(.wms-movement-order-table-setting-popover) {
+  padding: 12px;
+}
+
+:global(.wms-movement-order-table-setting) {
+  background-color: var(--el-fill-color-light);
+}
+
+:global(.wms-movement-order-table-setting .el-checkbox) {
+  height: 28px;
+  margin-right: 0;
+}
+
+:global(.wms-movement-order-table-setting .el-checkbox__label) {
+  font-size: 16px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 12e1c3076..fc779d3a4 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -75,13 +75,13 @@
           </template>
         </el-table-column>
         <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
-        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="140">
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="生产日期" width="140">
           <template #default="scope">
             {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="140">
+        <el-table-column label="过期日期" width="140">
           <template #default="scope">
             {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
           </template>
@@ -112,7 +112,7 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   formatPrice,
   formatQuantity,
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index adb39aaae..61a4ac171 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -126,12 +126,12 @@
             />
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="160">
+        <el-table-column label="批号" min-width="160">
           <template #default="scope">
             <el-input v-model="scope.row.batchNo" maxlength="64" placeholder="请输入批号" />
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="180">
+        <el-table-column label="生产日期" width="180">
           <template #default="scope">
             <el-date-picker
               v-model="scope.row.productionDate"
@@ -142,7 +142,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="180">
+        <el-table-column label="过期日期" width="180">
           <template #default="scope">
             <el-date-picker
               v-model="scope.row.expirationDate"
@@ -234,7 +234,7 @@ import ItemSkuSelect from '@/views/wms/md/item/sku/components/ItemSkuSelect.vue'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index da0b23715..d8ffc7705 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -31,19 +31,16 @@
               库区
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               批号
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               生产日期
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               过期日期
@@ -66,13 +63,13 @@
             <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.areaName || '-' }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.batchNo || '-' }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
             </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
@@ -101,7 +98,7 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 入库单打印 */
@@ -109,7 +106,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
 
 const printData = ref<ReceiptOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = computed(() => 5 + (AREA_ENABLE ? 1 : 0) + (BATCH_ENABLE ? 3 : 0))
+const tableColumnCount = computed(() => 8 + (AREA_ENABLE ? 1 : 0))
 const printObj = ref({
   id: 'wmsReceiptOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index aa05dbf26..2c8111069 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -244,14 +244,8 @@
               min-width="140"
               prop="areaName"
             />
-            <el-table-column
-              v-if="BATCH_ENABLE"
-              align="center"
-              label="批号"
-              min-width="140"
-              prop="batchNo"
-            />
-            <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+            <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column label="生产日期/过期日期" min-width="180">
               <template #default="detailScope">
                 <div v-if="detailScope.row.productionDate">
                   生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
@@ -428,7 +422,7 @@ import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   OrderDeleteStatusList,
   OrderStatusEnum,
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index ddc0c6a14..8ec9e682d 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -75,13 +75,13 @@
           </template>
         </el-table-column>
         <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="140" prop="batchNo" />
-        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="140">
+        <el-table-column label="批号" min-width="140" prop="batchNo" />
+        <el-table-column label="生产日期" width="140">
           <template #default="scope">
             {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="140">
+        <el-table-column label="过期日期" width="140">
           <template #default="scope">
             {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
           </template>
@@ -112,7 +112,7 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
 import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   formatPrice,
   formatQuantity,
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 90a3319d1..12478fb35 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -121,17 +121,17 @@
             {{ scope.row.areaName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="批号" min-width="160">
+        <el-table-column label="批号" min-width="160">
           <template #default="scope">
             {{ scope.row.batchNo || '-' }}
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="生产日期" width="180">
+        <el-table-column label="生产日期" width="180">
           <template #default="scope">
             {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
           </template>
         </el-table-column>
-        <el-table-column v-if="BATCH_ENABLE" label="过期日期" width="180">
+        <el-table-column label="过期日期" width="180">
           <template #default="scope">
             {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
           </template>
@@ -229,7 +229,7 @@ import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vu
 import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { formatNullableDate } from '@/utils/formatTime'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
@@ -320,7 +320,6 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
   skuId: inventory.skuId,
   skuCode: inventory.skuCode,
   skuName: inventory.skuName,
-  inventoryDetailId: inventory.inventoryDetailId,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
   areaId: inventory.areaId,
@@ -357,9 +356,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
 /** 判断库存是否已选择 */
 const isInventorySelected = (inventory: InventorySelectRow) => {
   return (formData.value.details || []).some((detail) => {
-    if (BATCH_ENABLE) {
-      return detail.inventoryDetailId === inventory.inventoryDetailId
-    }
     return (
       detail.skuId === inventory.skuId &&
       detail.warehouseId === inventory.warehouseId &&
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index ce3e39052..da2310510 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -31,19 +31,16 @@
               库区
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               批号
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               生产日期
             </th>
             <th
-              v-if="BATCH_ENABLE"
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
               过期日期
@@ -66,13 +63,13 @@
             <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.areaName || '-' }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.batchNo || '-' }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
             </td>
-            <td v-if="BATCH_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
+            <td class="border border-solid border-#dcdfe6 p-8px">
               {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
             </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
@@ -101,7 +98,7 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 出库单打印 */
@@ -109,7 +106,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
 
 const printData = ref<ShipmentOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = computed(() => 5 + (AREA_ENABLE ? 1 : 0) + (BATCH_ENABLE ? 3 : 0))
+const tableColumnCount = computed(() => 8 + (AREA_ENABLE ? 1 : 0))
 const printObj = ref({
   id: 'wmsShipmentOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 289405f22..3a8587e19 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -244,14 +244,8 @@
               min-width="140"
               prop="areaName"
             />
-            <el-table-column
-              v-if="BATCH_ENABLE"
-              align="center"
-              label="批号"
-              min-width="140"
-              prop="batchNo"
-            />
-            <el-table-column v-if="BATCH_ENABLE" label="生产日期/过期日期" min-width="180">
+            <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
+            <el-table-column label="生产日期/过期日期" min-width="180">
               <template #default="detailScope">
                 <div v-if="detailScope.row.productionDate">
                   生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
@@ -428,7 +422,7 @@ import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
 import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE, BATCH_ENABLE } from '@/views/wms/utils/config'
+import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   OrderDeleteStatusList,
   OrderStatusEnum,
diff --git a/src/views/wms/utils/config.ts b/src/views/wms/utils/config.ts
index 7a6f79260..96ccf0cdc 100644
--- a/src/views/wms/utils/config.ts
+++ b/src/views/wms/utils/config.ts
@@ -8,10 +8,3 @@
 
 /** 是否启用库区模式（对齐 yudao.wms.area-enable） */
 export const AREA_ENABLE = true
-
-/**
- * 是否启用批次/效期/库存明细模式（对齐 yudao.wms.batch-enable）
- *
- * 依赖 AREA_ENABLE = true
- */
-export const BATCH_ENABLE = true

From fdbb98fe6518a967e1362292f8958682dfe4a8c5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 20:29:25 +0800
Subject: [PATCH 19/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=87=8F=E6=B3=95=EF=BC=8C=E5=8E=BB=E6=8E=89=20area=20?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/history/index.ts        |   2 -
 src/api/wms/inventory/index.ts                |   2 -
 src/api/wms/md/warehouse/area/index.ts        |  50 ----
 src/api/wms/order/check/detail/index.ts       |   2 -
 src/api/wms/order/check/index.ts              |   2 -
 src/api/wms/order/movement/detail/index.ts    |   4 -
 src/api/wms/order/movement/index.ts           |   4 -
 src/api/wms/order/receipt/detail/index.ts     |   2 -
 src/api/wms/order/receipt/index.ts            |   2 -
 src/api/wms/order/shipment/detail/index.ts    |   2 -
 src/api/wms/order/shipment/index.ts           |   2 -
 src/router/modules/remaining.ts               |  23 --
 .../inventory/components/InventorySelect.vue  | 260 ++++++++++++++++++
 src/views/wms/inventory/history/index.vue     |  31 +--
 src/views/wms/inventory/index/index.vue       |  67 +----
 .../md/warehouse/area/WarehouseAreaForm.vue   | 120 --------
 src/views/wms/md/warehouse/area/index.vue     | 229 ---------------
 .../components/WarehouseAreaSelect.vue        |  83 ------
 src/views/wms/md/warehouse/index.vue          |   9 -
 .../wms/order/check/CheckOrderDetail.vue      |   2 -
 src/views/wms/order/check/CheckOrderForm.vue  |  21 --
 src/views/wms/order/check/index.vue           |  19 +-
 .../order/movement/MovementOrderDetail.vue    |  15 +-
 .../wms/order/movement/MovementOrderForm.vue  |  55 +---
 src/views/wms/order/movement/index.vue        |  17 +-
 .../wms/order/receipt/ReceiptOrderDetail.vue  |   5 -
 .../wms/order/receipt/ReceiptOrderForm.vue    |  43 +--
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  13 +-
 src/views/wms/order/receipt/index.vue         |  18 +-
 .../order/shipment/ShipmentOrderDetail.vue    |   5 -
 .../wms/order/shipment/ShipmentOrderForm.vue  |  37 +--
 .../wms/order/shipment/ShipmentOrderPrint.vue |  13 +-
 src/views/wms/order/shipment/index.vue        |  18 +-
 src/views/wms/utils/config.ts                 |  10 -
 34 files changed, 293 insertions(+), 894 deletions(-)
 delete mode 100644 src/api/wms/md/warehouse/area/index.ts
 create mode 100644 src/views/wms/inventory/components/InventorySelect.vue
 delete mode 100644 src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
 delete mode 100644 src/views/wms/md/warehouse/area/index.vue
 delete mode 100644 src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
 delete mode 100644 src/views/wms/utils/config.ts

diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
index c2db7d786..8b563c46f 100644
--- a/src/api/wms/inventory/history/index.ts
+++ b/src/api/wms/inventory/history/index.ts
@@ -12,8 +12,6 @@ export interface InventoryHistoryVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   quantity?: number
   beforeQuantity?: number
   afterQuantity?: number
diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts
index 3f8d65a6d..aa18ca302 100644
--- a/src/api/wms/inventory/index.ts
+++ b/src/api/wms/inventory/index.ts
@@ -12,8 +12,6 @@ export interface InventoryVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   quantity?: number
   remark?: string
   createTime?: Date
diff --git a/src/api/wms/md/warehouse/area/index.ts b/src/api/wms/md/warehouse/area/index.ts
deleted file mode 100644
index 9ef9c3ad4..000000000
--- a/src/api/wms/md/warehouse/area/index.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import request from '@/config/axios'
-
-// WMS 库区 VO
-export interface WarehouseAreaVO {
-  id?: number
-  code?: string
-  name?: string
-  warehouseId?: number
-  warehouseName?: string
-  remark?: string
-  createTime?: Date
-}
-
-// WMS 库区 API
-export const WarehouseAreaApi = {
-  // 查询库区分页
-  getWarehouseAreaPage: async (params: any) => {
-    return await request.get({ url: '/wms/warehouse-area/page', params })
-  },
-
-  // 查询库区精简列表
-  getWarehouseAreaSimpleList: async (warehouseId?: number) => {
-    return await request.get({ url: '/wms/warehouse-area/simple-list', params: { warehouseId } })
-  },
-
-  // 查询库区详情
-  getWarehouseArea: async (id: number) => {
-    return await request.get({ url: '/wms/warehouse-area/get?id=' + id })
-  },
-
-  // 新增库区
-  createWarehouseArea: async (data: WarehouseAreaVO) => {
-    return await request.post({ url: '/wms/warehouse-area/create', data })
-  },
-
-  // 修改库区
-  updateWarehouseArea: async (data: WarehouseAreaVO) => {
-    return await request.put({ url: '/wms/warehouse-area/update', data })
-  },
-
-  // 删除库区
-  deleteWarehouseArea: async (id: number) => {
-    return await request.delete({ url: '/wms/warehouse-area/delete?id=' + id })
-  },
-
-  // 导出库区
-  exportWarehouseArea: async (params) => {
-    return await request.download({ url: '/wms/warehouse-area/export-excel', params })
-  }
-}
diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index 9c1f679ff..4e10ad248 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -12,8 +12,6 @@ export interface CheckOrderDetailVO {
   inventoryId?: number
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   batchNo?: string
   productionDate?: Date
   expirationDate?: Date
diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts
index be3c3dbbd..9edfee0b1 100644
--- a/src/api/wms/order/check/index.ts
+++ b/src/api/wms/order/check/index.ts
@@ -9,8 +9,6 @@ export interface CheckOrderVO {
   remark?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   totalQuantity?: number
   totalAmount?: number
   details?: CheckOrderDetailVO[]
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index b38be4f34..5e3e31ff5 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -11,12 +11,8 @@ export interface MovementOrderDetailVO {
   skuName?: string
   sourceWarehouseId?: number
   sourceWarehouseName?: string
-  sourceAreaId?: number
-  sourceAreaName?: string
   targetWarehouseId?: number
   targetWarehouseName?: string
-  targetAreaId?: number
-  targetAreaName?: string
   batchNo?: string
   productionDate?: Date
   expirationDate?: Date
diff --git a/src/api/wms/order/movement/index.ts b/src/api/wms/order/movement/index.ts
index b5fcf41a9..45344245d 100644
--- a/src/api/wms/order/movement/index.ts
+++ b/src/api/wms/order/movement/index.ts
@@ -9,12 +9,8 @@ export interface MovementOrderVO {
   remark?: string
   sourceWarehouseId?: number
   sourceWarehouseName?: string
-  sourceAreaId?: number
-  sourceAreaName?: string
   targetWarehouseId?: number
   targetWarehouseName?: string
-  targetAreaId?: number
-  targetAreaName?: string
   totalQuantity?: number
   totalAmount?: number
   details?: MovementOrderDetailVO[]
diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
index 7d6990a39..e1e629d67 100644
--- a/src/api/wms/order/receipt/detail/index.ts
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -11,8 +11,6 @@ export interface ReceiptOrderDetailVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   batchNo?: string
   productionDate?: Date
   expirationDate?: Date
diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts
index 3defe4216..d3bfcd5f1 100644
--- a/src/api/wms/order/receipt/index.ts
+++ b/src/api/wms/order/receipt/index.ts
@@ -13,8 +13,6 @@ export interface ReceiptOrderVO {
   remark?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   totalQuantity?: number
   totalAmount?: number
   details?: ReceiptOrderDetailVO[]
diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 1ceaf25e4..4156a29ee 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -11,8 +11,6 @@ export interface ShipmentOrderDetailVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   batchNo?: string
   productionDate?: Date
   expirationDate?: Date
diff --git a/src/api/wms/order/shipment/index.ts b/src/api/wms/order/shipment/index.ts
index b9dc2fb59..b77d603f2 100644
--- a/src/api/wms/order/shipment/index.ts
+++ b/src/api/wms/order/shipment/index.ts
@@ -13,8 +13,6 @@ export interface ShipmentOrderVO {
   remark?: string
   warehouseId?: number
   warehouseName?: string
-  areaId?: number
-  areaName?: string
   totalQuantity?: number
   totalAmount?: number
   details?: ShipmentOrderDetailVO[]
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index a2ea1fbd9..ac59b3ab0 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -127,29 +127,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
-  {
-    path: '/wms',
-    component: Layout,
-    name: 'Wms',
-    meta: {
-      hidden: true
-    },
-    children: [
-      {
-        path: 'md/warehouse/area/:warehouseId',
-        component: () => import('@/views/wms/md/warehouse/area/index.vue'),
-        name: 'WmsWarehouseArea',
-        meta: {
-          title: '库区管理',
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          icon: '',
-          activeMenu: '/wms/md/warehouse'
-        }
-      }
-    ]
-  },
   {
     path: '/codegen',
     component: Layout,
diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
new file mode 100644
index 000000000..739e9ea69
--- /dev/null
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -0,0 +1,260 @@
+<!-- WMS 库存选择器 -->
+<template>
+  <Dialog
+    v-model="dialogVisible"
+    :append-to-body="true"
+    :scroll="true"
+    max-height="calc(100vh - 220px)"
+    title="库存选择"
+    width="80%"
+  >
+    <ContentWrap>
+      <el-form
+        ref="queryFormRef"
+        :inline="true"
+        :model="queryParams"
+        class="-mb-15px"
+        label-width="80px"
+      >
+        <el-form-item label="商品名称" prop="itemName">
+          <el-input
+            v-model="queryParams.itemName"
+            class="!w-240px"
+            clearable
+            placeholder="请输入商品名称"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="商品编号" prop="itemCode">
+          <el-input
+            v-model="queryParams.itemCode"
+            class="!w-240px"
+            clearable
+            placeholder="请输入商品编号"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="规格名称" prop="skuName">
+          <el-input
+            v-model="queryParams.skuName"
+            class="!w-240px"
+            clearable
+            placeholder="请输入规格名称"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="规格编号" prop="skuCode">
+          <el-input
+            v-model="queryParams.skuCode"
+            class="!w-240px"
+            clearable
+            placeholder="请输入规格编号"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery">
+            <Icon class="mr-5px" icon="ep:search" />
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <ContentWrap class="!mb-0">
+      <el-table
+        ref="tableRef"
+        v-loading="loading"
+        :data="list"
+        :row-key="getRowKey"
+        :show-overflow-tooltip="true"
+        :stripe="true"
+        border
+        max-height="calc(100vh - 430px)"
+        @row-dblclick="handleRowDblClick"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column :reserve-selection="true" align="center" type="selection" width="50" />
+        <el-table-column label="商品信息" min-width="220">
+          <template #default="{ row }">
+            <div>{{ row.itemName || '-' }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格信息" min-width="220">
+          <template #default="{ row }">
+            <div>{{ row.skuName || '-' }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ row.skuCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库" min-width="180">
+          <template #default="{ row }">
+            {{ row.warehouseName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="可用库存" width="130">
+          <template #default="{ row }">
+            {{ formatQuantity(row.availableQuantity) }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="overflow-hidden">
+        <Pagination
+          v-model:limit="queryParams.pageSize"
+          v-model:page="queryParams.pageNo"
+          :total="total"
+          @pagination="getList"
+        />
+      </div>
+    </ContentWrap>
+
+    <template #footer>
+      <el-button type="primary" @click="handleConfirm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ElTable } from 'element-plus'
+import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
+import { formatQuantity } from '@/views/wms/utils/format'
+
+export interface InventorySelectRow extends InventoryVO {
+  batchNo?: string
+  productionDate?: Date
+  expirationDate?: Date
+  amount?: number
+  availableQuantity?: number
+}
+
+/** WMS 库存选择器 */
+defineOptions({ name: 'WmsInventorySelect' })
+
+const props = defineProps<{
+  warehouseId?: number
+}>()
+
+const message = useMessage() // 消息弹窗
+const loading = ref(false) // 列表的加载中
+const dialogVisible = ref(false) // 弹窗的是否展示
+const list = ref<InventorySelectRow[]>([]) // 库存列表
+const total = ref(0) // 列表的总条数
+const selectedMap = ref<Map<string, InventorySelectRow>>(new Map()) // 跨页已选择库存
+const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
+const queryFormRef = ref() // 搜索的表单
+const getDefaultQueryParams = () => ({
+  pageNo: 1,
+  pageSize: 10,
+  itemName: undefined as string | undefined,
+  itemCode: undefined as string | undefined,
+  skuName: undefined as string | undefined,
+  skuCode: undefined as string | undefined
+})
+const queryParams = reactive(getDefaultQueryParams())
+
+const emit = defineEmits<{
+  change: [list: InventorySelectRow[]]
+}>()
+
+/** 打开弹窗 */
+const open = async () => {
+  if (!props.warehouseId) {
+    message.warning('请先选择仓库')
+    return
+  }
+  dialogVisible.value = true
+  Object.assign(queryParams, getDefaultQueryParams())
+  selectedMap.value = new Map()
+  await nextTick()
+  tableRef.value?.clearSelection()
+  await getList()
+}
+defineExpose({ open })
+
+/** 查询库存列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const params = {
+      ...queryParams,
+      type: 'warehouse',
+      warehouseId: props.warehouseId,
+      minQuantity: 0.01
+    }
+    const data = await InventoryApi.getInventoryPage(params)
+    list.value = data.list.map((inventory: InventoryVO) => ({
+      ...inventory,
+      availableQuantity: inventory.quantity
+    }))
+    total.value = data.total
+    await nextTick()
+    applySelection()
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  Object.assign(queryParams, getDefaultQueryParams())
+  queryFormRef.value?.resetFields()
+  getList()
+}
+
+/** 获得行唯一标识 */
+const getRowKey = (row: InventorySelectRow) => {
+  return `inventory-${row.id || `${row.skuId}-${row.warehouseId}`}`
+}
+
+/** 恢复当前页选择状态 */
+const applySelection = () => {
+  const table = tableRef.value
+  if (!table || selectedMap.value.size === 0) {
+    return
+  }
+  list.value.forEach((row) => {
+    if (selectedMap.value.has(getRowKey(row))) {
+      table.toggleRowSelection(row, true)
+    }
+  })
+}
+
+/** 选择行变化 */
+const handleSelectionChange = (rows: InventorySelectRow[]) => {
+  const currentKeys = new Set(list.value.map((row) => getRowKey(row)))
+  currentKeys.forEach((key) => selectedMap.value.delete(key))
+  rows.forEach((row) => selectedMap.value.set(getRowKey(row), row))
+}
+
+/** 双击行直接选择 */
+const handleRowDblClick = (row: InventorySelectRow) => {
+  selectedMap.value.set(getRowKey(row), row)
+  handleConfirm()
+}
+
+/** 确认选择 */
+const handleConfirm = () => {
+  const selectedList = Array.from(selectedMap.value.values())
+  if (selectedList.length === 0) {
+    message.warning('请选择库存')
+    return
+  }
+  emit('change', selectedList)
+  dialogVisible.value = false
+}
+</script>
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index fdf017bab..db4afff75 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -35,18 +35,7 @@
         />
       </el-form-item>
       <el-form-item label="仓库" prop="warehouseId">
-        <WarehouseSelect
-          v-model="queryParams.warehouseId"
-          class="!w-240px"
-          @change="handleWarehouseChange"
-        />
-      </el-form-item>
-      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
-        <WarehouseAreaSelect
-          v-model="queryParams.areaId"
-          :warehouse-id="queryParams.warehouseId"
-          class="!w-240px"
-        />
+        <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" />
       </el-form-item>
       <el-form-item label="商品编号" prop="itemCode">
         <el-input
@@ -140,15 +129,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="AREA_ENABLE ? '仓库/库区' : '仓库'" min-width="160">
+      <el-table-column label="仓库" min-width="160">
         <template #default="scope">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
-            <div>库区：{{ scope.row.areaName || '-' }}</div>
-          </template>
-          <template v-else>
-            {{ scope.row.warehouseName || '-' }}
-          </template>
+          {{ scope.row.warehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column align="right" label="操作前" min-width="110">
@@ -207,9 +190,7 @@
 import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/history'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存流水 */
@@ -228,7 +209,6 @@ const queryParams = reactive({
   skuCode: undefined as string | undefined,
   skuName: undefined as string | undefined,
   warehouseId: undefined as number | undefined,
-  areaId: undefined as number | undefined,
   createTime: undefined as string[] | undefined
 })
 const queryFormRef = ref() // 搜索的表单
@@ -257,11 +237,6 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 仓库变化 */
-const handleWarehouseChange = () => {
-  queryParams.areaId = undefined
-}
-
 /** 初始化 */
 onMounted(async () => {
   await getList()
diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue
index 4ff9416a3..abf0e22c0 100644
--- a/src/views/wms/inventory/index/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -21,18 +21,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="仓库" prop="warehouseId">
-        <WarehouseSelect
-          v-model="queryParams.warehouseId"
-          class="!w-240px"
-          @change="handleWarehouseChange"
-        />
-      </el-form-item>
-      <el-form-item v-if="isAreaQueryVisible" label="库区" prop="areaId">
-        <WarehouseAreaSelect
-          v-model="queryParams.areaId"
-          :warehouse-id="queryParams.warehouseId"
-          class="!w-240px"
-        />
+        <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" />
       </el-form-item>
       <el-form-item label="商品名称" prop="itemName">
         <el-input
@@ -105,23 +94,7 @@
             {{ scope.row.warehouseName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column
-          v-if="queryParams.type === INVENTORY_DIMENSION.AREA"
-          label="库区"
-          min-width="160"
-          prop="areaId"
-        >
-          <template #default="scope">
-            {{ scope.row.areaName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="商品信息"
-          min-width="240"
-          :prop="
-            queryParams.type === INVENTORY_DIMENSION.WAREHOUSE ? 'warehouseItemId' : 'areaItemId'
-          "
-        >
+        <el-table-column label="商品信息" min-width="240" prop="warehouseItemId">
           <template #default="scope">
             <div>{{ scope.row.itemName || '-' }}</div>
             <div v-if="scope.row.itemCode" class="text-12px text-gray-500">
@@ -160,11 +133,6 @@
             {{ scope.row.warehouseName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="所属库区" min-width="160" prop="areaId">
-          <template #default="scope">
-            {{ scope.row.areaName || '-' }}
-          </template>
-        </el-table-column>
       </template>
       <el-table-column align="right" label="库存" min-width="130" prop="quantity">
         <template #default="scope">
@@ -184,9 +152,7 @@
 
 <script lang="ts" setup>
 import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 库存统计 */
@@ -194,24 +160,18 @@ defineOptions({ name: 'WmsInventory' })
 
 const INVENTORY_DIMENSION = {
   WAREHOUSE: 'warehouse',
-  AREA: 'area',
   ITEM: 'item'
 } as const
 type InventoryDimension = (typeof INVENTORY_DIMENSION)[keyof typeof INVENTORY_DIMENSION]
 
 const dimensionOptions = computed(() => [
   { label: '仓库', value: INVENTORY_DIMENSION.WAREHOUSE },
-  ...(AREA_ENABLE ? [{ label: '库区', value: INVENTORY_DIMENSION.AREA }] : []),
   { label: '商品', value: INVENTORY_DIMENSION.ITEM }
 ])
-const warehouseDimensionList: InventoryDimension[] = [
-  INVENTORY_DIMENSION.WAREHOUSE,
-  INVENTORY_DIMENSION.AREA
-]
+const warehouseDimensionList: InventoryDimension[] = [INVENTORY_DIMENSION.WAREHOUSE]
 
 interface InventoryRow extends InventoryVO {
   warehouseItemId?: string
-  areaItemId?: string
   skuWarehouseId?: string
 }
 
@@ -234,8 +194,7 @@ const queryParams = reactive({
   itemName: undefined as string | undefined,
   skuCode: undefined as string | undefined,
   skuName: undefined as string | undefined,
-  warehouseId: undefined as number | undefined,
-  areaId: undefined as number | undefined
+  warehouseId: undefined as number | undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -245,14 +204,12 @@ const getList = async () => {
   try {
     const data = await InventoryApi.getInventoryPage({
       ...queryParams,
-      areaId: isAreaQueryVisible.value ? queryParams.areaId : undefined,
       minQuantity: filterZero.value ? 1 : undefined
     })
     list.value = data.list.map((item: InventoryVO) => ({
       ...item,
       // 展示字段
       warehouseItemId: `${item.warehouseId || 0}-${item.itemId || 0}`,
-      areaItemId: `${item.areaId || 0}-${item.itemId || 0}`,
       skuWarehouseId: `${item.skuId || 0}-${item.warehouseId || 0}`
     }))
     total.value = data.total
@@ -278,9 +235,6 @@ const resetQuery = () => {
 /** 统计维度变化 */
 const handleTypeChange = () => {
   queryParams.pageNo = 1
-  if (queryParams.type === INVENTORY_DIMENSION.WAREHOUSE) {
-    queryParams.areaId = undefined
-  }
   getList()
 }
 
@@ -290,16 +244,6 @@ const handleFilterZeroChange = () => {
   getList()
 }
 
-/** 仓库变化 */
-const handleWarehouseChange = () => {
-  queryParams.areaId = undefined
-}
-
-/** 是否展示库区搜索项 */
-const isAreaQueryVisible = computed(() => {
-  return AREA_ENABLE && queryParams.type !== INVENTORY_DIMENSION.WAREHOUSE
-})
-
 /** 合并库存统计的维度单元格 */
 const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
   const property = column.property
@@ -331,9 +275,6 @@ const getRowSpanProperties = () => {
   if (queryParams.type === INVENTORY_DIMENSION.ITEM) {
     return ['itemId', 'skuId', 'skuWarehouseId']
   }
-  if (queryParams.type === INVENTORY_DIMENSION.AREA) {
-    return ['warehouseId', 'areaId', 'areaItemId']
-  }
   return ['warehouseId', 'warehouseItemId']
 }
 
diff --git a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue b/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
deleted file mode 100644
index 5b1e12185..000000000
--- a/src/views/wms/md/warehouse/area/WarehouseAreaForm.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- WMS 库区表单 -->
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-    >
-      <el-form-item label="所属仓库" prop="warehouseId">
-        <WarehouseSelect v-model="formData.warehouseId" placeholder="请选择所属仓库" />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="name">
-        <el-input v-model="formData.name" maxlength="60" placeholder="请输入库区名称" />
-      </el-form-item>
-      <el-form-item label="库区编号" prop="code">
-        <el-input v-model="formData.code" maxlength="20" placeholder="请输入库区编号" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="formData.remark"
-          maxlength="255"
-          placeholder="请输入备注"
-          type="textarea"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-
-<script lang="ts" setup>
-import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
-import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-
-/** WMS 库区表单 */
-defineOptions({ name: 'WmsWarehouseAreaForm' })
-
-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 formData = ref<WarehouseAreaVO>({
-  id: undefined,
-  code: undefined,
-  name: undefined,
-  warehouseId: undefined,
-  remark: undefined
-})
-const formRules = reactive({
-  warehouseId: [{ required: true, message: '所属仓库不能为空', trigger: 'change' }],
-  code: [{ required: true, message: '库区编号不能为空', trigger: 'blur' }],
-  name: [{ required: true, message: '库区名称不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number, warehouseId?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  if (warehouseId) {
-    formData.value.warehouseId = warehouseId
-  }
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await WarehouseAreaApi.getWarehouseArea(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as WarehouseAreaVO
-    if (formType.value === 'create') {
-      await WarehouseAreaApi.createWarehouseArea(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await WarehouseAreaApi.updateWarehouseArea(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    code: undefined,
-    name: undefined,
-    warehouseId: undefined,
-    remark: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>
diff --git a/src/views/wms/md/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
deleted file mode 100644
index d0d7921ba..000000000
--- a/src/views/wms/md/warehouse/area/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<!-- WMS 库区管理 -->
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      ref="queryFormRef"
-      :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
-      label-width="68px"
-    >
-      <el-form-item label="所属仓库" prop="warehouseId">
-        <WarehouseSelect
-          v-model="queryParams.warehouseId"
-          class="!w-240px"
-          placeholder="请选择所属仓库"
-          @change="warehouseChange"
-        />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          class="!w-240px"
-          clearable
-          placeholder="请输入库区名称"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库区编号" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          class="!w-240px"
-          clearable
-          placeholder="请输入库区编号"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon class="mr-5px" icon="ep:search" />
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
-        <el-button
-          v-hasPermi="['wms:warehouse-area:create']"
-          plain
-          type="primary"
-          @click="openForm('create')"
-        >
-          <Icon class="mr-5px" icon="ep:plus" />
-          新增
-        </el-button>
-        <el-button
-          v-hasPermi="['wms:warehouse-area:export']"
-          :loading="exportLoading"
-          plain
-          type="success"
-          @click="handleExport"
-        >
-          <Icon class="mr-5px" icon="ep:download" />
-          导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="库区名称" prop="name" />
-      <el-table-column align="center" label="库区编号" prop="code" />
-      <el-table-column align="center" label="所属仓库" prop="warehouseName">
-        <template #default="scope">
-          {{ scope.row.warehouseName || getWarehouseName(scope.row.warehouseId) }}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="备注" prop="remark" />
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="创建时间"
-        prop="createTime"
-        width="180"
-      />
-      <el-table-column align="center" label="操作" width="150">
-        <template #default="scope">
-          <el-button
-            v-hasPermi="['wms:warehouse-area:update']"
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-          >
-            修改
-          </el-button>
-          <el-button
-            v-hasPermi="['wms:warehouse-area:delete']"
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <WarehouseAreaForm ref="formRef" @success="getList" />
-</template>
-
-<script lang="ts" setup>
-import { dateFormatter } from '@/utils/formatTime'
-import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
-import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
-import WarehouseAreaForm from './WarehouseAreaForm.vue'
-import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import download from '@/utils/download'
-
-/** WMS 库区管理 */
-defineOptions({ name: 'WmsWarehouseArea' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由
-
-const loading = ref(true) // 列表的加载中
-const list = ref<WarehouseAreaVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  warehouseId: Number(route.params.warehouseId) || undefined,
-  code: undefined,
-  name: undefined
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-const warehouseList = ref<WarehouseVO[]>([]) // 仓库精简列表
-
-/** 查询库区列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await WarehouseAreaApi.getWarehouseAreaPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 查询仓库精简列表 */
-const getWarehouseList = async () => {
-  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
-}
-
-/** 获得仓库名称 */
-const getWarehouseName = (warehouseId?: number) => {
-  return warehouseList.value.find((warehouse) => warehouse.id === warehouseId)?.name
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 所属仓库更改同时更新列表数据 */
-const warehouseChange = () => {
-  handleQuery()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id, queryParams.warehouseId)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await WarehouseAreaApi.deleteWarehouseArea(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await WarehouseAreaApi.exportWarehouseArea(queryParams)
-    download.excel(data, '库区.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 */
-onMounted(async () => {
-  await getWarehouseList()
-  await getList()
-})
-</script>
diff --git a/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue b/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
deleted file mode 100644
index a7035459c..000000000
--- a/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- WMS 库区选择器 -->
-<template>
-  <el-select
-    v-bind="$attrs"
-    v-model="selectValue"
-    :clearable="clearable"
-    :disabled="disabled"
-    :filter-method="handleFilter"
-    :placeholder="placeholder"
-    class="w-1/1"
-    filterable
-    @change="handleChange"
-  >
-    <el-option v-for="area in filteredList" :key="area.id!" :label="area.name" :value="area.id!" />
-  </el-select>
-</template>
-
-<script lang="ts" setup>
-import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/wms/md/warehouse/area'
-
-/** WMS 库区选择器 */
-defineOptions({ name: 'WmsWarehouseAreaSelect', inheritAttrs: false })
-
-const props = withDefaults(
-  defineProps<{
-    modelValue?: number
-    warehouseId?: number
-    disabled?: boolean
-    clearable?: boolean
-    placeholder?: string
-  }>(),
-  {
-    disabled: false,
-    clearable: true,
-    placeholder: '请选择库区'
-  }
-)
-
-const emit = defineEmits<{
-  'update:modelValue': [value: number | undefined]
-  change: [area: WarehouseAreaVO | undefined]
-}>()
-
-const areaList = ref<WarehouseAreaVO[]>([]) // 库区列表
-const filteredList = ref<WarehouseAreaVO[]>([]) // 过滤后的库区列表
-
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (value) => emit('update:modelValue', value)
-})
-
-/** 前端过滤 */
-const handleFilter = (query: string) => {
-  if (!query) {
-    filteredList.value = areaList.value
-    return
-  }
-  const keyword = query.toLowerCase()
-  filteredList.value = areaList.value.filter((area) => area.name?.toLowerCase().includes(keyword))
-}
-
-/** 选中变化 */
-const handleChange = (value: number | undefined) => {
-  emit(
-    'change',
-    areaList.value.find((area) => area.id === value)
-  )
-}
-
-/** 获得库区列表 */
-const getAreaList = async () => {
-  try {
-    areaList.value = await WarehouseAreaApi.getWarehouseAreaSimpleList(props.warehouseId)
-    filteredList.value = areaList.value
-  } catch {
-    areaList.value = []
-    filteredList.value = []
-  }
-}
-
-/** 监听仓库变化 */
-watch(() => props.warehouseId, getAreaList, { immediate: true })
-</script>
diff --git a/src/views/wms/md/warehouse/index.vue b/src/views/wms/md/warehouse/index.vue
index 178443245..36cdca370 100644
--- a/src/views/wms/md/warehouse/index.vue
+++ b/src/views/wms/md/warehouse/index.vue
@@ -75,14 +75,6 @@
       />
       <el-table-column align="center" label="操作" width="210">
         <template #default="scope">
-          <router-link
-            v-if="AREA_ENABLE"
-            :to="{ name: 'WmsWarehouseArea', params: { warehouseId: scope.row.id } }"
-          >
-            <el-button v-hasPermi="['wms:warehouse-area:query']" link type="primary">
-              库区
-            </el-button>
-          </router-link>
           <el-button
             v-hasPermi="['wms:warehouse:update']"
             link
@@ -118,7 +110,6 @@
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import WarehouseForm from './WarehouseForm.vue'
 import download from '@/utils/download'
 
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 2bde086e3..3c43a89ab 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -14,7 +14,6 @@
           <span v-else>-</span>
         </el-descriptions-item>
         <el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
-        <el-descriptions-item v-if="AREA_ENABLE" label="库区">{{ detailData.areaName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="盈亏数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
@@ -73,7 +72,6 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 盘库单详情 */
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 98630b782..37eb5f2fc 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -13,11 +13,6 @@
             <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
           </el-form-item>
         </el-col>
-        <el-col v-if="AREA_ENABLE" :span="8">
-          <el-form-item label="库区" prop="areaId">
-            <WarehouseAreaSelect v-model="formData.areaId" :warehouse-id="formData.warehouseId" @change="handleAreaChange" />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="盈亏数量">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
@@ -111,7 +106,6 @@
       </el-table>
       <InventorySelect
         ref="inventorySelectRef"
-        :area-id="formData.areaId"
         :warehouse-id="formData.warehouseId"
         @change="handleSelectInventory"
       />
@@ -152,9 +146,7 @@ import { FormRules } from 'element-plus'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
@@ -175,7 +167,6 @@ const formData = ref<CheckOrderVO>({
   no: undefined,
   status: OrderStatusEnum.PREPARE,
   warehouseId: undefined,
-  areaId: undefined,
   totalQuantity: 0,
   totalAmount: 0,
   remark: undefined,
@@ -237,8 +228,6 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
   inventoryId: inventory.id,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
-  areaId: inventory.areaId,
-  areaName: inventory.areaName,
   batchNo: inventory.batchNo,
   productionDate: inventory.productionDate,
   expirationDate: inventory.expirationDate,
@@ -268,11 +257,6 @@ const handleDeleteDetail = (index: number) => {
   refreshTotalAmount()
 }
 const handleWarehouseChange = () => {
-  formData.value.areaId = undefined
-  formData.value.details = []
-  refreshTotalAmount()
-}
-const handleAreaChange = () => {
   formData.value.details = []
   refreshTotalAmount()
 }
@@ -291,10 +275,6 @@ const validateDetails = (required: boolean) => {
   }
   for (let i = 0; i < formData.value.details.length; i++) {
     const detail = formData.value.details[i]
-    if (AREA_ENABLE && !detail.areaId) {
-      message.error(`第 ${i + 1} 行明细请选择库区`)
-      return false
-    }
     if (detail.checkQuantity === undefined || detail.checkQuantity < 0) {
       message.error(`第 ${i + 1} 行明细实盘数量不能小于 0`)
       return false
@@ -374,7 +354,6 @@ const resetForm = () => {
     no: generateOrderNo('PK'),
     status: OrderStatusEnum.PREPARE,
     warehouseId: undefined,
-    areaId: undefined,
     totalQuantity: 0,
     totalAmount: 0,
     remark: undefined,
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index ac4742892..3807926c6 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -16,10 +16,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="warehouseId">
-        <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" @change="handleWarehouseChange" />
-      </el-form-item>
-      <el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
-        <WarehouseAreaSelect v-model="queryParams.areaId" :warehouse-id="queryParams.warehouseId" class="!w-240px" />
+        <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" />
       </el-form-item>
       <el-form-item label="单据日期" prop="orderDate">
         <el-date-picker
@@ -199,15 +196,11 @@
       </el-table-column>
       <el-table-column
         v-if="isTableColumnVisible('warehouse')"
-        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        label="仓库"
         min-width="180"
       >
         <template #default="{ row }">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ row.warehouseName || '-' }}</div>
-            <div>库区：{{ row.areaName || '-' }}</div>
-          </template>
-          <template v-else>{{ row.warehouseName || '-' }}</template>
+          {{ row.warehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="盈亏数量/总金额(元)" min-width="180">
@@ -272,9 +265,7 @@ import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
@@ -317,7 +308,6 @@ const getDefaultQueryParams = () => ({
   no: undefined as string | undefined,
   status: undefined as number | undefined,
   warehouseId: undefined as number | undefined,
-  areaId: undefined as number | undefined,
   orderDate: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
@@ -363,9 +353,6 @@ const resetQuery = () => {
   Object.assign(queryParams, getDefaultQueryParams())
   handleQuery()
 }
-const handleWarehouseChange = () => {
-  queryParams.areaId = undefined
-}
 const handleExpandChange = async (row: CheckOrderVO) => {
   if (!row.id || detailMap[row.id]) return
   detailMap[row.id] = await CheckOrderApi.getCheckOrderDetailListByOrderId(row.id)
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 7f1184392..e0be44deb 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -13,17 +13,11 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
-        <el-descriptions-item :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'">
-          <template v-if="AREA_ENABLE">
-            {{ detailData.sourceWarehouseName || '-' }} / {{ detailData.sourceAreaName || '-' }}
-          </template>
-          <template v-else>{{ detailData.sourceWarehouseName || '-' }}</template>
+        <el-descriptions-item label="来源仓库">
+          {{ detailData.sourceWarehouseName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'">
-          <template v-if="AREA_ENABLE">
-            {{ detailData.targetWarehouseName || '-' }} / {{ detailData.targetAreaName || '-' }}
-          </template>
-          <template v-else>{{ detailData.targetWarehouseName || '-' }}</template>
+        <el-descriptions-item label="目标仓库">
+          {{ detailData.targetWarehouseName || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="总数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
@@ -80,7 +74,6 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 移库单详情 */
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 9a827f2ec..e06757ee1 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -13,29 +13,11 @@
             <WarehouseSelect v-model="formData.sourceWarehouseId" @change="handleSourceWarehouseChange" />
           </el-form-item>
         </el-col>
-        <el-col v-if="AREA_ENABLE" :span="8">
-          <el-form-item label="来源库区" prop="sourceAreaId">
-            <WarehouseAreaSelect
-              v-model="formData.sourceAreaId"
-              :warehouse-id="formData.sourceWarehouseId"
-              @change="handleSourceAreaChange"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="目标仓库" prop="targetWarehouseId">
             <WarehouseSelect v-model="formData.targetWarehouseId" @change="handleTargetWarehouseChange" />
           </el-form-item>
         </el-col>
-        <el-col v-if="AREA_ENABLE" :span="8">
-          <el-form-item label="目标库区" prop="targetAreaId">
-            <WarehouseAreaSelect
-              v-model="formData.targetAreaId"
-              :warehouse-id="formData.targetWarehouseId"
-              @change="handleTargetAreaChange"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
@@ -84,7 +66,6 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="来源库区" min-width="140" prop="sourceAreaName" />
         <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="可用库存" width="120">
           <template #default="{ row }">{{ formatQuantity(row.availableQuantity) || '-' }}</template>
@@ -127,7 +108,6 @@
       </el-table>
       <InventorySelect
         ref="inventorySelectRef"
-        :area-id="formData.sourceAreaId"
         :warehouse-id="formData.sourceWarehouseId"
         @change="handleSelectInventory"
       />
@@ -168,9 +148,7 @@ import { FormRules } from 'element-plus'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice, sumQuantity } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
@@ -191,9 +169,7 @@ const formData = ref<MovementOrderVO>({
   no: undefined,
   status: OrderStatusEnum.PREPARE,
   sourceWarehouseId: undefined,
-  sourceAreaId: undefined,
   targetWarehouseId: undefined,
-  targetAreaId: undefined,
   totalQuantity: 0,
   totalAmount: 0,
   remark: undefined,
@@ -252,10 +228,7 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
   skuName: inventory.skuName,
   sourceWarehouseId: inventory.warehouseId,
   sourceWarehouseName: inventory.warehouseName,
-  sourceAreaId: inventory.areaId,
-  sourceAreaName: inventory.areaName,
   targetWarehouseId: formData.value.targetWarehouseId,
-  targetAreaId: formData.value.targetAreaId,
   batchNo: inventory.batchNo,
   productionDate: inventory.productionDate,
   expirationDate: inventory.expirationDate,
@@ -283,8 +256,7 @@ const isInventorySelected = (inventory: InventorySelectRow) =>
   (formData.value.details || []).some((detail) => {
     return (
       detail.skuId === inventory.skuId &&
-      detail.sourceWarehouseId === inventory.warehouseId &&
-      detail.sourceAreaId === inventory.areaId
+      detail.sourceWarehouseId === inventory.warehouseId
     )
   })
 
@@ -294,24 +266,16 @@ const handleDeleteDetail = (index: number) => {
 }
 
 const handleSourceWarehouseChange = () => {
-  formData.value.sourceAreaId = undefined
-  formData.value.details = []
-  refreshTotalAmount()
-}
-const handleSourceAreaChange = () => {
   formData.value.details = []
   refreshTotalAmount()
 }
 const handleTargetWarehouseChange = () => {
-  formData.value.targetAreaId = undefined
   refreshTargetToDetails()
 }
-const handleTargetAreaChange = () => refreshTargetToDetails()
 const refreshTargetToDetails = () => {
   const details = formData.value.details || []
   details.forEach((detail) => {
     detail.targetWarehouseId = formData.value.targetWarehouseId
-    detail.targetAreaId = formData.value.targetAreaId
   })
 }
 const refreshTotalAmount = () => {
@@ -320,6 +284,10 @@ const refreshTotalAmount = () => {
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
+  if (formData.value.sourceWarehouseId === formData.value.targetWarehouseId) {
+    message.error('来源仓库和目标仓库不能相同')
+    return false
+  }
   if (!formData.value.details?.length) {
     if (required) {
       message.error('至少包含一条移库明细')
@@ -327,19 +295,8 @@ const validateDetails = (required: boolean) => {
     }
     return true
   }
-  if (
-    formData.value.sourceWarehouseId === formData.value.targetWarehouseId &&
-    formData.value.sourceAreaId === formData.value.targetAreaId
-  ) {
-    message.error('来源仓库库区和目标仓库库区不能相同')
-    return false
-  }
   for (let i = 0; i < formData.value.details.length; i++) {
     const detail = formData.value.details[i]
-    if (AREA_ENABLE && (!detail.sourceAreaId || !detail.targetAreaId)) {
-      message.error(`第 ${i + 1} 行明细请选择来源和目标库区`)
-      return false
-    }
     if (!detail.quantity || detail.quantity <= 0) {
       message.error(`第 ${i + 1} 行明细移库数量必须大于 0`)
       return false
@@ -423,9 +380,7 @@ const resetForm = () => {
     no: generateOrderNo('YK'),
     status: OrderStatusEnum.PREPARE,
     sourceWarehouseId: undefined,
-    sourceAreaId: undefined,
     targetWarehouseId: undefined,
-    targetAreaId: undefined,
     totalQuantity: 0,
     totalAmount: 0,
     remark: undefined,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 3c27f4c87..2a6c7fa8c 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -199,28 +199,20 @@
       </el-table-column>
       <el-table-column
         v-if="isTableColumnVisible('sourceWarehouse')"
-        :label="AREA_ENABLE ? '来源仓库/库区' : '来源仓库'"
+        label="来源仓库"
         min-width="180"
       >
         <template #default="{ row }">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ row.sourceWarehouseName || '-' }}</div>
-            <div>库区：{{ row.sourceAreaName || '-' }}</div>
-          </template>
-          <template v-else>{{ row.sourceWarehouseName || '-' }}</template>
+          {{ row.sourceWarehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
         v-if="isTableColumnVisible('targetWarehouse')"
-        :label="AREA_ENABLE ? '目标仓库/库区' : '目标仓库'"
+        label="目标仓库"
         min-width="180"
       >
         <template #default="{ row }">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ row.targetWarehouseName || '-' }}</div>
-            <div>库区：{{ row.targetAreaName || '-' }}</div>
-          </template>
-          <template v-else>{{ row.targetWarehouseName || '-' }}</template>
+          {{ row.targetWarehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="总数量/总金额(元)" min-width="180">
@@ -286,7 +278,6 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index fc779d3a4..5dda7c68b 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -30,9 +30,6 @@
         <el-descriptions-item label="业务单号">
           {{ detailData.bizOrderNo || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item v-if="AREA_ENABLE" label="库区">
-          {{ detailData.areaName || '-' }}
-        </el-descriptions-item>
         <el-descriptions-item label="总数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
@@ -74,7 +71,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
         <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column label="生产日期" width="140">
           <template #default="scope">
@@ -112,7 +108,6 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   formatPrice,
   formatQuantity,
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index 61a4ac171..57e740c4d 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -42,16 +42,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="仓库" prop="warehouseId">
-            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="AREA_ENABLE" :span="8">
-          <el-form-item label="库区" prop="areaId">
-            <WarehouseAreaSelect
-              v-model="formData.areaId"
-              :warehouse-id="formData.warehouseId"
-              @change="handleAreaChange"
-            />
+            <WarehouseSelect v-model="formData.warehouseId" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -71,7 +62,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="AREA_ENABLE ? 8 : 16">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -116,16 +107,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="180">
-          <template #default="scope">
-            <WarehouseAreaSelect
-              v-model="scope.row.areaId"
-              :disabled="!formData.warehouseId || !!formData.areaId"
-              :warehouse-id="formData.warehouseId"
-              placeholder="请选择库区"
-            />
-          </template>
-        </el-table-column>
         <el-table-column label="批号" min-width="160">
           <template #default="scope">
             <el-input v-model="scope.row.batchNo" maxlength="64" placeholder="请输入批号" />
@@ -232,9 +213,7 @@ import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
 import { ItemSkuVO } from '@/api/wms/md/item/sku'
 import ItemSkuSelect from '@/views/wms/md/item/sku/components/ItemSkuSelect.vue'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
@@ -264,7 +243,6 @@ const formData = ref<ReceiptOrderVO>({
   bizOrderNo: undefined,
   merchantId: undefined,
   warehouseId: undefined,
-  areaId: undefined,
   totalQuantity: 0,
   totalAmount: 0,
   remark: undefined,
@@ -325,7 +303,6 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
   skuId: sku.id,
   skuCode: sku.code,
   skuName: sku.name,
-  areaId: formData.value.areaId,
   batchNo: undefined,
   productionDate: undefined,
   expirationDate: undefined,
@@ -355,17 +332,6 @@ const handleDeleteDetail = (index: number) => {
   refreshTotalAmount()
 }
 
-/** 仓库变化 */
-const handleWarehouseChange = () => {
-  formData.value.areaId = undefined
-  formData.value.details?.forEach((detail) => (detail.areaId = undefined))
-}
-
-/** 库区变化 */
-const handleAreaChange = () => {
-  formData.value.details?.forEach((detail) => (detail.areaId = formData.value.areaId))
-}
-
 /** 明细金额变化 */
 const handleDetailAmountChange = () => {
   refreshTotalAmount()
@@ -391,10 +357,6 @@ const validateDetails = (required: boolean) => {
       message.error(`第 ${i + 1} 行明细请选择商品规格`)
       return false
     }
-    if (AREA_ENABLE && !detail.areaId) {
-      message.error(`第 ${i + 1} 行明细请选择库区`)
-      return false
-    }
     if (!detail.quantity || detail.quantity <= 0) {
       message.error(`第 ${i + 1} 行明细入库数量必须大于 0`)
       return false
@@ -487,7 +449,6 @@ const resetForm = () => {
     bizOrderNo: undefined,
     merchantId: undefined,
     warehouseId: undefined,
-    areaId: undefined,
     totalQuantity: 0,
     totalAmount: 0,
     remark: undefined,
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index d8ffc7705..45b54246c 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -13,7 +13,6 @@
         <div>供应商：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div v-if="AREA_ENABLE">库区：{{ printData.areaName || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@@ -24,12 +23,6 @@
           <tr>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
-            <th
-              v-if="AREA_ENABLE"
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              库区
-            </th>
             <th
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
@@ -60,9 +53,6 @@
               <div>{{ detail.skuName || '-' }}</div>
               <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
             </td>
-            <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
-              {{ detail.areaName || '-' }}
-            </td>
             <td class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.batchNo || '-' }}
             </td>
@@ -98,7 +88,6 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 入库单打印 */
@@ -106,7 +95,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
 
 const printData = ref<ReceiptOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = computed(() => 8 + (AREA_ENABLE ? 1 : 0))
+const tableColumnCount = 8
 const printObj = ref({
   id: 'wmsReceiptOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 2c8111069..24b13eb3b 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -237,13 +237,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="AREA_ENABLE"
-              align="center"
-              label="库区"
-              min-width="140"
-              prop="areaName"
-            />
             <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
             <el-table-column label="生产日期/过期日期" min-width="180">
               <template #default="detailScope">
@@ -305,17 +298,11 @@
       </el-table-column>
       <el-table-column
         v-if="isTableColumnVisible('warehouse')"
-        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        label="仓库"
         min-width="160"
       >
         <template #default="scope">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
-            <div>库区：{{ scope.row.areaName || '-' }}</div>
-          </template>
-          <template v-else>
-            {{ scope.row.warehouseName || '-' }}
-          </template>
+          {{ scope.row.warehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -422,7 +409,6 @@ import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   OrderDeleteStatusList,
   OrderStatusEnum,
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 8ec9e682d..59f605cff 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -30,9 +30,6 @@
         <el-descriptions-item label="业务单号">
           {{ detailData.bizOrderNo || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item v-if="AREA_ENABLE" label="库区">
-          {{ detailData.areaName || '-' }}
-        </el-descriptions-item>
         <el-descriptions-item label="总数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
@@ -74,7 +71,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140" prop="areaName" />
         <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column label="生产日期" width="140">
           <template #default="scope">
@@ -112,7 +108,6 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
 import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   formatPrice,
   formatQuantity,
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 12478fb35..4522059f3 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -45,15 +45,6 @@
             <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
           </el-form-item>
         </el-col>
-        <el-col v-if="AREA_ENABLE" :span="8">
-          <el-form-item label="库区" prop="areaId">
-            <WarehouseAreaSelect
-              v-model="formData.areaId"
-              :warehouse-id="formData.warehouseId"
-              @change="handleAreaChange"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
@@ -71,7 +62,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="AREA_ENABLE ? 8 : 16">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -116,11 +107,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="AREA_ENABLE" label="库区" min-width="140">
-          <template #default="scope">
-            {{ scope.row.areaName || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="批号" min-width="160">
           <template #default="scope">
             {{ scope.row.batchNo || '-' }}
@@ -179,7 +165,6 @@
       </el-table>
       <InventorySelect
         ref="inventorySelectRef"
-        :area-id="formData.areaId"
         :warehouse-id="formData.warehouseId"
         @change="handleSelectInventory"
       />
@@ -226,10 +211,8 @@ import InventorySelect, {
   InventorySelectRow
 } from '@/views/wms/inventory/components/InventorySelect.vue'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
-import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { formatNullableDate } from '@/utils/formatTime'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
@@ -259,7 +242,6 @@ const formData = ref<ShipmentOrderVO>({
   bizOrderNo: undefined,
   merchantId: undefined,
   warehouseId: undefined,
-  areaId: undefined,
   totalQuantity: 0,
   totalAmount: 0,
   remark: undefined,
@@ -322,8 +304,6 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
   skuName: inventory.skuName,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
-  areaId: inventory.areaId,
-  areaName: inventory.areaName,
   batchNo: inventory.batchNo,
   productionDate: inventory.productionDate,
   expirationDate: inventory.expirationDate,
@@ -358,8 +338,7 @@ const isInventorySelected = (inventory: InventorySelectRow) => {
   return (formData.value.details || []).some((detail) => {
     return (
       detail.skuId === inventory.skuId &&
-      detail.warehouseId === inventory.warehouseId &&
-      detail.areaId === inventory.areaId
+      detail.warehouseId === inventory.warehouseId
     )
   })
 }
@@ -372,13 +351,6 @@ const handleDeleteDetail = (index: number) => {
 
 /** 仓库变化 */
 const handleWarehouseChange = () => {
-  formData.value.areaId = undefined
-  formData.value.details = []
-  refreshTotalAmount()
-}
-
-/** 库区变化 */
-const handleAreaChange = () => {
   formData.value.details = []
   refreshTotalAmount()
 }
@@ -408,10 +380,6 @@ const validateDetails = (required: boolean) => {
       message.error(`第 ${i + 1} 行明细请选择商品规格`)
       return false
     }
-    if (AREA_ENABLE && !detail.areaId) {
-      message.error(`第 ${i + 1} 行明细请选择库区`)
-      return false
-    }
     if (!detail.quantity || detail.quantity <= 0) {
       message.error(`第 ${i + 1} 行明细出库数量必须大于 0`)
       return false
@@ -508,7 +476,6 @@ const resetForm = () => {
     bizOrderNo: undefined,
     merchantId: undefined,
     warehouseId: undefined,
-    areaId: undefined,
     totalQuantity: 0,
     totalAmount: 0,
     remark: undefined,
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index da2310510..0e20a0fa7 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -13,7 +13,6 @@
         <div>客户：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div v-if="AREA_ENABLE">库区：{{ printData.areaName || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@@ -24,12 +23,6 @@
           <tr>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
-            <th
-              v-if="AREA_ENABLE"
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              库区
-            </th>
             <th
               class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
             >
@@ -60,9 +53,6 @@
               <div>{{ detail.skuName || '-' }}</div>
               <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
             </td>
-            <td v-if="AREA_ENABLE" class="border border-solid border-#dcdfe6 p-8px">
-              {{ detail.areaName || '-' }}
-            </td>
             <td class="border border-solid border-#dcdfe6 p-8px">
               {{ detail.batchNo || '-' }}
             </td>
@@ -98,7 +88,6 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
 
 /** WMS 出库单打印 */
@@ -106,7 +95,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
 
 const printData = ref<ShipmentOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = computed(() => 8 + (AREA_ENABLE ? 1 : 0))
+const tableColumnCount = 8
 const printObj = ref({
   id: 'wmsShipmentOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 3a8587e19..19f439183 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -237,13 +237,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="AREA_ENABLE"
-              align="center"
-              label="库区"
-              min-width="140"
-              prop="areaName"
-            />
             <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
             <el-table-column label="生产日期/过期日期" min-width="180">
               <template #default="detailScope">
@@ -305,17 +298,11 @@
       </el-table-column>
       <el-table-column
         v-if="isTableColumnVisible('warehouse')"
-        :label="AREA_ENABLE ? '仓库/库区' : '仓库'"
+        label="仓库"
         min-width="160"
       >
         <template #default="scope">
-          <template v-if="AREA_ENABLE">
-            <div>仓库：{{ scope.row.warehouseName || '-' }}</div>
-            <div>库区：{{ scope.row.areaName || '-' }}</div>
-          </template>
-          <template v-else>
-            {{ scope.row.warehouseName || '-' }}
-          </template>
+          {{ scope.row.warehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -422,7 +409,6 @@ import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
 import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
 import {
   OrderDeleteStatusList,
   OrderStatusEnum,
diff --git a/src/views/wms/utils/config.ts b/src/views/wms/utils/config.ts
deleted file mode 100644
index 96ccf0cdc..000000000
--- a/src/views/wms/utils/config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * WMS 前端运行参数
- *
- * 标注「后端镜像」的常量与 yudao.wms.* 配置默认值一致；调整后端配置时需同步修改这里
- */
-
-// ==================== 后端镜像（与 WmsProperties 默认值对齐） ====================
-
-/** 是否启用库区模式（对齐 yudao.wms.area-enable） */
-export const AREA_ENABLE = true

From 8d06f87e0f93654e084a8fd9f92e48b872e2b804 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 22:06:37 +0800
Subject: [PATCH 20/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=87=8F=E6=B3=95=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7=E7=AD=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/history/index.ts        |  3 --
 src/api/wms/order/check/detail/index.ts       |  3 --
 src/api/wms/order/movement/detail/index.ts    |  3 --
 src/api/wms/order/receipt/detail/index.ts     |  3 --
 src/api/wms/order/shipment/detail/index.ts    |  3 --
 .../inventory/components/InventorySelect.vue  |  3 --
 src/views/wms/inventory/history/index.vue     | 13 +----
 .../md/item/sku/components/ItemSkuSelect.vue  | 33 +++++++++++--
 .../wms/order/check/CheckOrderDetail.vue      |  1 -
 src/views/wms/order/check/CheckOrderForm.vue  |  4 --
 src/views/wms/order/check/index.vue           |  1 -
 .../order/movement/MovementOrderDetail.vue    |  1 -
 .../wms/order/movement/MovementOrderForm.vue  |  4 --
 src/views/wms/order/movement/index.vue        |  1 -
 .../wms/order/receipt/ReceiptOrderDetail.vue  | 11 -----
 .../wms/order/receipt/ReceiptOrderForm.vue    | 48 +++++++------------
 .../wms/order/receipt/ReceiptOrderPrint.vue   | 26 +---------
 src/views/wms/order/receipt/index.vue         | 11 -----
 .../order/shipment/ShipmentOrderDetail.vue    | 11 -----
 .../wms/order/shipment/ShipmentOrderForm.vue  | 18 -------
 .../wms/order/shipment/ShipmentOrderPrint.vue | 26 +---------
 src/views/wms/order/shipment/index.vue        | 11 -----
 22 files changed, 47 insertions(+), 191 deletions(-)

diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
index 8b563c46f..10a997d7b 100644
--- a/src/api/wms/inventory/history/index.ts
+++ b/src/api/wms/inventory/history/index.ts
@@ -15,9 +15,6 @@ export interface InventoryHistoryVO {
   quantity?: number
   beforeQuantity?: number
   afterQuantity?: number
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   amount?: number
   remark?: string
   orderId?: number
diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index 4e10ad248..221130f27 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -12,9 +12,6 @@ export interface CheckOrderDetailVO {
   inventoryId?: number
   warehouseId?: number
   warehouseName?: string
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   receiptTime?: Date
   quantity?: number
   checkQuantity?: number
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index 5e3e31ff5..be7cc2d22 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -13,9 +13,6 @@ export interface MovementOrderDetailVO {
   sourceWarehouseName?: string
   targetWarehouseId?: number
   targetWarehouseName?: string
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   quantity?: number
   availableQuantity?: number
   amount?: number
diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
index e1e629d67..c9961949e 100644
--- a/src/api/wms/order/receipt/detail/index.ts
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -11,9 +11,6 @@ export interface ReceiptOrderDetailVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   quantity?: number
   amount?: number
   remark?: string
diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 4156a29ee..11b07322e 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -11,9 +11,6 @@ export interface ShipmentOrderDetailVO {
   skuName?: string
   warehouseId?: number
   warehouseName?: string
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   quantity?: number
   availableQuantity?: number
   amount?: number
diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
index 739e9ea69..1ecfba9e9 100644
--- a/src/views/wms/inventory/components/InventorySelect.vue
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -129,9 +129,6 @@ import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
 import { formatQuantity } from '@/views/wms/utils/format'
 
 export interface InventorySelectRow extends InventoryVO {
-  batchNo?: string
-  productionDate?: Date
-  expirationDate?: Date
   amount?: number
   availableQuantity?: number
 }
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index db4afff75..2ee3a5e07 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -156,17 +156,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
-      <el-table-column label="生产日期/过期日期" min-width="180">
-        <template #default="scope">
-          <div v-if="scope.row.productionDate">
-            生产日期：{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-          </div>
-          <div v-if="scope.row.expirationDate">
-            过期日期：{{ formatDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -187,7 +176,7 @@
 </template>
 
 <script lang="ts" setup>
-import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime'
+import { dateFormatter, defaultShortcuts } from '@/utils/formatTime'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/history'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
index ba9970aa0..313366b1f 100644
--- a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -78,7 +78,13 @@
         @selection-change="handleSelectionChange"
         @row-dblclick="handleRowDblClick"
       >
-        <el-table-column :reserve-selection="true" align="center" type="selection" width="50" />
+        <el-table-column
+          :reserve-selection="true"
+          :selectable="isRowSelectable"
+          align="center"
+          type="selection"
+          width="50"
+        />
         <el-table-column label="商品信息" min-width="220">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
@@ -149,6 +155,7 @@ const total = ref(0) // 列表的总条数
 const selectedList = ref<ItemSkuVO[]>([]) // 已选择 SKU 列表
 const selectedMap = ref<Map<number, ItemSkuVO>>(new Map()) // 跨页已选择 SKU
 const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 SKU 编号
+const disabledSelectedIds = ref<Set<number>>(new Set()) // 已在业务明细中使用的 SKU 编号
 const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
 const queryFormRef = ref() // 搜索的表单
 const getDefaultQueryParams = () => ({
@@ -172,6 +179,7 @@ const open = async (selectedIds?: number[]) => {
   selectedList.value = []
   selectedMap.value = new Map()
   preSelectedIds.value = selectedIds || []
+  disabledSelectedIds.value = new Set(preSelectedIds.value)
   await nextTick()
   tableRef.value?.clearSelection()
   await loadSkuList()
@@ -261,15 +269,24 @@ const applyPreSelection = () => {
   }
   list.value.forEach((row) => {
     if (row.id && selectedMap.value.has(row.id)) {
-      table.toggleRowSelection(row, true)
+      table.toggleRowSelection(row, true, true)
     }
   })
 }
 
+/** 是否允许勾选 SKU */
+const isRowSelectable = (row: ItemSkuVO) => {
+  return row.id === undefined || !disabledSelectedIds.value.has(row.id)
+}
+
 /** 选择变化 */
 const handleSelectionChange = (rows: ItemSkuVO[]) => {
   const currentPageIds = list.value.map((row) => row.id).filter((id): id is number => !!id)
-  currentPageIds.forEach((id) => selectedMap.value.delete(id))
+  currentPageIds.forEach((id) => {
+    if (!disabledSelectedIds.value.has(id)) {
+      selectedMap.value.delete(id)
+    }
+  })
   rows.forEach((row) => {
     if (row.id) {
       selectedMap.value.set(row.id, row)
@@ -280,16 +297,22 @@ const handleSelectionChange = (rows: ItemSkuVO[]) => {
 
 /** 双击行：切换勾选 */
 const handleRowDblClick = (row: ItemSkuVO) => {
+  if (row.id && disabledSelectedIds.value.has(row.id)) {
+    return
+  }
   tableRef.value?.toggleRowSelection(row)
 }
 
 /** 确认选择 */
 const handleConfirm = () => {
-  if (selectedList.value.length === 0) {
+  const newSelectedList = selectedList.value.filter(
+    (sku) => sku.id !== undefined && !disabledSelectedIds.value.has(sku.id)
+  )
+  if (newSelectedList.length === 0) {
     message.warning('请至少选择一条数据')
     return
   }
-  emit('change', selectedList.value)
+  emit('change', newSelectedList)
   dialogVisible.value = false
 }
 </script>
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 3c43a89ab..751a446ab 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -49,7 +49,6 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="账面数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 37eb5f2fc..3889cc2d7 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -61,7 +61,6 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="账面数量" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
@@ -228,9 +227,6 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
   inventoryId: inventory.id,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
-  batchNo: inventory.batchNo,
-  productionDate: inventory.productionDate,
-  expirationDate: inventory.expirationDate,
   quantity: inventory.availableQuantity,
   checkQuantity: inventory.availableQuantity,
   availableQuantity: inventory.availableQuantity,
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 3807926c6..383eb8a7c 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -164,7 +164,6 @@
                 <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
               </template>
             </el-table-column>
-            <el-table-column label="批号" min-width="140" prop="batchNo" />
             <el-table-column align="right" label="账面数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index e0be44deb..6adcc1e5b 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -56,7 +56,6 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index e06757ee1..09e8fc5ca 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -66,7 +66,6 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
         <el-table-column align="right" label="可用库存" width="120">
           <template #default="{ row }">{{ formatQuantity(row.availableQuantity) || '-' }}</template>
         </el-table-column>
@@ -229,9 +228,6 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
   sourceWarehouseId: inventory.warehouseId,
   sourceWarehouseName: inventory.warehouseName,
   targetWarehouseId: formData.value.targetWarehouseId,
-  batchNo: inventory.batchNo,
-  productionDate: inventory.productionDate,
-  expirationDate: inventory.expirationDate,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
   amount: undefined,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 2a6c7fa8c..7a6cae489 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -169,7 +169,6 @@
                 <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
               </template>
             </el-table-column>
-            <el-table-column label="批号" min-width="140" prop="batchNo" />
             <el-table-column align="right" label="移库数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 5dda7c68b..d54b2c981 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -71,17 +71,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
-        <el-table-column label="生产日期" width="140">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="过期日期" width="140">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
         <el-table-column align="right" label="数量" prop="quantity" width="120">
           <template #default="scope">
             {{ formatQuantity(scope.row.quantity) || '-' }}
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index 57e740c4d..bd75af044 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -107,33 +107,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="160">
-          <template #default="scope">
-            <el-input v-model="scope.row.batchNo" maxlength="64" placeholder="请输入批号" />
-          </template>
-        </el-table-column>
-        <el-table-column label="生产日期" width="180">
-          <template #default="scope">
-            <el-date-picker
-              v-model="scope.row.productionDate"
-              class="!w-1/1"
-              placeholder="请选择生产日期"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="过期日期" width="180">
-          <template #default="scope">
-            <el-date-picker
-              v-model="scope.row.expirationDate"
-              class="!w-1/1"
-              placeholder="请选择过期日期"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-          </template>
-        </el-table-column>
         <el-table-column label="入库数量" width="160">
           <template #default="scope">
             <el-input-number
@@ -303,9 +276,6 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
   skuId: sku.id,
   skuCode: sku.code,
   skuName: sku.name,
-  batchNo: undefined,
-  productionDate: undefined,
-  expirationDate: undefined,
   quantity: undefined,
   amount: undefined,
   remark: undefined
@@ -313,7 +283,7 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
 
 /** 添加商品 */
 const handleAddDetail = () => {
-  skuSelectRef.value?.open()
+  skuSelectRef.value?.open(getSelectedSkuIds())
 }
 
 /** 选择商品 SKU */
@@ -322,10 +292,24 @@ const handleSelectSku = (skus: ItemSkuVO[]) => {
     return
   }
   formData.value.details = formData.value.details || []
-  skus.forEach((sku) => formData.value.details!.push(buildDetail(sku)))
+  const selectedSkuIds = new Set(getSelectedSkuIds())
+  skus.forEach((sku) => {
+    if (!sku.id || selectedSkuIds.has(sku.id)) {
+      return
+    }
+    formData.value.details!.push(buildDetail(sku))
+    selectedSkuIds.add(sku.id)
+  })
   refreshTotalAmount()
 }
 
+/** 获得已选 SKU 编号 */
+const getSelectedSkuIds = () => {
+  return (formData.value.details || [])
+    .map((detail) => detail.skuId)
+    .filter((id): id is number => !!id)
+}
+
 /** 删除明细 */
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 45b54246c..dbc636705 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -23,21 +23,6 @@
           <tr>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              批号
-            </th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              生产日期
-            </th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              过期日期
-            </th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
@@ -53,15 +38,6 @@
               <div>{{ detail.skuName || '-' }}</div>
               <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
             </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ detail.batchNo || '-' }}
-            </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
-            </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
-            </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
               {{ formatQuantity(detail.quantity) || '-' }}
             </td>
@@ -95,7 +71,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
 
 const printData = ref<ReceiptOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 8
+const tableColumnCount = 5
 const printObj = ref({
   id: 'wmsReceiptOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 24b13eb3b..7f5596ede 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -237,17 +237,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
-            <el-table-column label="生产日期/过期日期" min-width="180">
-              <template #default="detailScope">
-                <div v-if="detailScope.row.productionDate">
-                  生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
-                </div>
-                <div v-if="detailScope.row.expirationDate">
-                  过期日期：{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
-                </div>
-              </template>
-            </el-table-column>
             <el-table-column align="right" label="入库数量" width="120">
               <template #default="detailScope">
                 {{ formatQuantity(detailScope.row.quantity) }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 59f605cff..868dc0563 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -71,17 +71,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="140" prop="batchNo" />
-        <el-table-column label="生产日期" width="140">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="过期日期" width="140">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
         <el-table-column align="right" label="数量" prop="quantity" width="120">
           <template #default="scope">
             {{ formatQuantity(scope.row.quantity) || '-' }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 4522059f3..cf75f4db7 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -107,21 +107,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="批号" min-width="160">
-          <template #default="scope">
-            {{ scope.row.batchNo || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="生产日期" width="180">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="过期日期" width="180">
-          <template #default="scope">
-            {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-          </template>
-        </el-table-column>
         <el-table-column align="right" label="可用库存" width="120">
           <template #default="scope">
             {{ formatQuantity(scope.row.availableQuantity) || '-' }}
@@ -304,9 +289,6 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
   skuName: inventory.skuName,
   warehouseId: inventory.warehouseId,
   warehouseName: inventory.warehouseName,
-  batchNo: inventory.batchNo,
-  productionDate: inventory.productionDate,
-  expirationDate: inventory.expirationDate,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
   amount: undefined,
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 0e20a0fa7..e3e655310 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -23,21 +23,6 @@
           <tr>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              批号
-            </th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              生产日期
-            </th>
-            <th
-              class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-            >
-              过期日期
-            </th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
@@ -53,15 +38,6 @@
               <div>{{ detail.skuName || '-' }}</div>
               <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
             </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ detail.batchNo || '-' }}
-            </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
-            </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">
-              {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
-            </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
               {{ formatQuantity(detail.quantity) || '-' }}
             </td>
@@ -95,7 +71,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
 
 const printData = ref<ShipmentOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 8
+const tableColumnCount = 5
 const printObj = ref({
   id: 'wmsShipmentOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 19f439183..2fcf29b51 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -237,17 +237,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="批号" min-width="140" prop="batchNo" />
-            <el-table-column label="生产日期/过期日期" min-width="180">
-              <template #default="detailScope">
-                <div v-if="detailScope.row.productionDate">
-                  生产日期：{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
-                </div>
-                <div v-if="detailScope.row.expirationDate">
-                  过期日期：{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
-                </div>
-              </template>
-            </el-table-column>
             <el-table-column align="right" label="出库数量" width="120">
               <template #default="detailScope">
                 {{ formatQuantity(detailScope.row.quantity) }}

From a7911bcbcf5d3f101adba4d7f7657ef91dbddfe1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 May 2026 23:31:03 +0800
Subject: [PATCH 21/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20order=5Ftime=20=E5=8D=95=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/check/detail/index.ts       |  1 -
 src/api/wms/order/check/index.ts              |  1 +
 src/api/wms/order/movement/detail/index.ts    |  1 -
 src/api/wms/order/movement/index.ts           |  1 +
 src/api/wms/order/receipt/detail/index.ts     |  1 -
 src/api/wms/order/receipt/index.ts            |  1 +
 src/api/wms/order/shipment/detail/index.ts    |  1 -
 src/api/wms/order/shipment/index.ts           |  1 +
 .../wms/order/check/CheckOrderDetail.vue      |  5 +-
 src/views/wms/order/check/CheckOrderForm.vue  | 30 +++++---
 src/views/wms/order/check/index.vue           | 14 ++--
 .../order/movement/MovementOrderDetail.vue    | 16 +++--
 .../wms/order/movement/MovementOrderForm.vue  | 30 +++++---
 src/views/wms/order/movement/index.vue        | 15 ++--
 .../wms/order/receipt/ReceiptOrderDetail.vue  | 19 ++---
 .../wms/order/receipt/ReceiptOrderForm.vue    | 70 ++++++++++--------
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  7 +-
 src/views/wms/order/receipt/index.vue         | 15 ++--
 .../order/shipment/ShipmentOrderDetail.vue    | 19 ++---
 .../wms/order/shipment/ShipmentOrderForm.vue  | 71 +++++++++++--------
 .../wms/order/shipment/ShipmentOrderPrint.vue |  7 +-
 src/views/wms/order/shipment/index.vue        | 15 ++--
 22 files changed, 193 insertions(+), 148 deletions(-)

diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index 221130f27..4009d7f5e 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -18,6 +18,5 @@ export interface CheckOrderDetailVO {
   differenceQuantity?: number
   availableQuantity?: number
   amount?: number
-  remark?: string
   createTime?: Date
 }
diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts
index 9edfee0b1..3773c64ea 100644
--- a/src/api/wms/order/check/index.ts
+++ b/src/api/wms/order/check/index.ts
@@ -5,6 +5,7 @@ import { CheckOrderDetailVO } from './detail'
 export interface CheckOrderVO {
   id?: number
   no?: string
+  orderTime?: string
   status?: number
   remark?: string
   warehouseId?: number
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index be7cc2d22..df7a1d228 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -16,6 +16,5 @@ export interface MovementOrderDetailVO {
   quantity?: number
   availableQuantity?: number
   amount?: number
-  remark?: string
   createTime?: Date
 }
diff --git a/src/api/wms/order/movement/index.ts b/src/api/wms/order/movement/index.ts
index 45344245d..8542dd2e0 100644
--- a/src/api/wms/order/movement/index.ts
+++ b/src/api/wms/order/movement/index.ts
@@ -5,6 +5,7 @@ import { MovementOrderDetailVO } from './detail'
 export interface MovementOrderVO {
   id?: number
   no?: string
+  orderTime?: string
   status?: number
   remark?: string
   sourceWarehouseId?: number
diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
index c9961949e..f957d52cf 100644
--- a/src/api/wms/order/receipt/detail/index.ts
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -13,6 +13,5 @@ export interface ReceiptOrderDetailVO {
   warehouseName?: string
   quantity?: number
   amount?: number
-  remark?: string
   createTime?: Date
 }
diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts
index d3bfcd5f1..1c1b4a393 100644
--- a/src/api/wms/order/receipt/index.ts
+++ b/src/api/wms/order/receipt/index.ts
@@ -6,6 +6,7 @@ export interface ReceiptOrderVO {
   id?: number
   no?: string
   type?: number
+  orderTime?: string
   status?: number
   bizOrderNo?: string
   merchantId?: number
diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 11b07322e..30e48f4da 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -14,6 +14,5 @@ export interface ShipmentOrderDetailVO {
   quantity?: number
   availableQuantity?: number
   amount?: number
-  remark?: string
   createTime?: Date
 }
diff --git a/src/api/wms/order/shipment/index.ts b/src/api/wms/order/shipment/index.ts
index b77d603f2..ccbcfb85b 100644
--- a/src/api/wms/order/shipment/index.ts
+++ b/src/api/wms/order/shipment/index.ts
@@ -6,6 +6,7 @@ export interface ShipmentOrderVO {
   id?: number
   no?: string
   type?: number
+  orderTime?: string
   status?: number
   bizOrderNo?: string
   merchantId?: number
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 751a446ab..f0d6e52af 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -5,6 +5,10 @@
       <div class="mb-16px text-18px font-bold">单据信息</div>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="盘库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -13,7 +17,6 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
-        <el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="盈亏数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 3889cc2d7..60dd3d6d3 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -14,12 +14,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="盈亏数量">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盈亏数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="总金额">
+          <el-form-item label="总金额" prop="totalAmount">
             <el-input-number
               v-model="formData.totalAmount"
               :controls="false"
@@ -92,11 +103,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="160">
-          <template #default="{ row }">
-            <el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="操作" width="80">
           <template #default="{ $index }">
             <el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
@@ -164,6 +170,7 @@ const originalFormData = ref('')
 const formData = ref<CheckOrderVO>({
   id: undefined,
   no: undefined,
+  orderTime: undefined,
   status: OrderStatusEnum.PREPARE,
   warehouseId: undefined,
   totalQuantity: 0,
@@ -173,7 +180,10 @@ const formData = ref<CheckOrderVO>({
 })
 const formRules = reactive<FormRules>({
   no: [{ required: true, message: '盘库单号不能为空', trigger: 'blur' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+  orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
+  totalQuantity: [{ required: true, message: '盈亏数量不能为空', trigger: 'change' }],
+  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
 })
 const formRef = ref()
 const inventorySelectRef = ref()
@@ -230,8 +240,7 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
   quantity: inventory.availableQuantity,
   checkQuantity: inventory.availableQuantity,
   availableQuantity: inventory.availableQuantity,
-  amount: inventory.amount,
-  remark: undefined
+  amount: inventory.amount
 })
 
 const handleAddDetail = () => inventorySelectRef.value?.open()
@@ -348,6 +357,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     no: generateOrderNo('PK'),
+    orderTime: undefined,
     status: OrderStatusEnum.PREPARE,
     warehouseId: undefined,
     totalQuantity: 0,
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 383eb8a7c..7513d06c1 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -18,14 +18,14 @@
       <el-form-item label="仓库" prop="warehouseId">
         <WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="单据日期" prop="orderDate">
+      <el-form-item label="单据日期" prop="orderTime">
         <el-date-picker
-          v-model="queryParams.orderDate"
-          :shortcuts="defaultShortcuts"
+          v-model="queryParams.orderTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束时间"
-          start-placeholder="开始时间"
-          type="datetimerange"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
@@ -307,7 +307,7 @@ const getDefaultQueryParams = () => ({
   no: undefined as string | undefined,
   status: undefined as number | undefined,
   warehouseId: undefined as number | undefined,
-  orderDate: undefined as string[] | undefined,
+  orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
   totalAmountMin: undefined as number | undefined,
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 6adcc1e5b..f71552113 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -5,6 +5,15 @@
       <div class="mb-16px text-18px font-bold">单据信息</div>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="移库单号">{{ detailData.no || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="来源仓库">
+          {{ detailData.sourceWarehouseName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="目标仓库">
+          {{ detailData.targetWarehouseName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -13,12 +22,6 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
-        <el-descriptions-item label="来源仓库">
-          {{ detailData.sourceWarehouseName || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="目标仓库">
-          {{ detailData.targetWarehouseName || '-' }}
-        </el-descriptions-item>
         <el-descriptions-item label="总数量">
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
@@ -62,7 +65,6 @@
         <el-table-column align="right" label="金额(元)" prop="amount" width="140">
           <template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
         </el-table-column>
-        <el-table-column label="备注" min-width="160" prop="remark" />
       </el-table>
     </div>
   </Dialog>
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 09e8fc5ca..434df2391 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -19,12 +19,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="总数量">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="总金额">
+          <el-form-item label="总金额" prop="totalAmount">
             <el-input-number
               v-model="formData.totalAmount"
               :controls="false"
@@ -94,11 +105,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="160">
-          <template #default="{ row }">
-            <el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="操作" width="80">
           <template #default="{ $index }">
             <el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
@@ -166,6 +172,7 @@ const originalFormData = ref('')
 const formData = ref<MovementOrderVO>({
   id: undefined,
   no: undefined,
+  orderTime: undefined,
   status: OrderStatusEnum.PREPARE,
   sourceWarehouseId: undefined,
   targetWarehouseId: undefined,
@@ -176,8 +183,11 @@ const formData = ref<MovementOrderVO>({
 })
 const formRules = reactive<FormRules>({
   no: [{ required: true, message: '移库单号不能为空', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
   sourceWarehouseId: [{ required: true, message: '来源仓库不能为空', trigger: 'change' }],
-  targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }]
+  targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }],
+  totalQuantity: [{ required: true, message: '移库数量不能为空', trigger: 'change' }],
+  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
 })
 const formRef = ref()
 const inventorySelectRef = ref()
@@ -230,8 +240,7 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
   targetWarehouseId: formData.value.targetWarehouseId,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
-  amount: undefined,
-  remark: undefined
+  amount: undefined
 })
 
 const handleAddDetail = () => inventorySelectRef.value?.open()
@@ -374,6 +383,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     no: generateOrderNo('YK'),
+    orderTime: undefined,
     status: OrderStatusEnum.PREPARE,
     sourceWarehouseId: undefined,
     targetWarehouseId: undefined,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 7a6cae489..927a67aa9 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -21,14 +21,14 @@
       <el-form-item label="目标仓库" prop="targetWarehouseId">
         <WarehouseSelect v-model="queryParams.targetWarehouseId" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="单据日期" prop="orderDate">
+      <el-form-item label="单据日期" prop="orderTime">
         <el-date-picker
-          v-model="queryParams.orderDate"
-          :shortcuts="defaultShortcuts"
+          v-model="queryParams.orderTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束时间"
-          start-placeholder="开始时间"
-          type="datetimerange"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
@@ -175,7 +175,6 @@
             <el-table-column align="right" label="金额(元)" width="120">
               <template #default="{ row: detail }">{{ formatPrice(detail.amount) || '-' }}</template>
             </el-table-column>
-            <el-table-column label="备注" min-width="160" prop="remark" />
           </el-table>
         </template>
       </el-table-column>
@@ -329,7 +328,7 @@ const getDefaultQueryParams = () => ({
   status: undefined as number | undefined,
   sourceWarehouseId: undefined as number | undefined,
   targetWarehouseId: undefined as number | undefined,
-  orderDate: undefined as string[] | undefined,
+  orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
   totalAmountMin: undefined as number | undefined,
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index d54b2c981..9fa64c52e 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -5,14 +5,6 @@
       <div class="mb-16px text-18px font-bold">单据信息</div>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="入库单号">{{ detailData.no || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="单据状态">
-          <dict-tag
-            v-if="detailData.status !== undefined"
-            :type="DICT_TYPE.WMS_ORDER_STATUS"
-            :value="detailData.status"
-          />
-          <span v-else>-</span>
-        </el-descriptions-item>
         <el-descriptions-item label="入库类型">
           <dict-tag
             v-if="detailData.type !== undefined"
@@ -24,6 +16,17 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
         <el-descriptions-item label="供应商">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index bd75af044..badecb0f9 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -26,6 +26,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WarehouseSelect v-model="formData.warehouseId" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="供应商" prop="merchantId">
             <MerchantSelect
@@ -41,28 +46,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="仓库" prop="warehouseId">
-            <WarehouseSelect v-model="formData.warehouseId" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总数量">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -73,6 +56,34 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量" prop="totalQuantity">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额" prop="totalAmount">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
@@ -132,11 +143,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="180">
-          <template #default="scope">
-            <el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="操作" width="80">
           <template #default="scope">
             <el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
@@ -212,6 +218,7 @@ const formData = ref<ReceiptOrderVO>({
   id: undefined,
   no: undefined,
   type: undefined,
+  orderTime: undefined,
   status: OrderStatusEnum.PREPARE,
   bizOrderNo: undefined,
   merchantId: undefined,
@@ -224,7 +231,10 @@ const formData = ref<ReceiptOrderVO>({
 const formRules = reactive<FormRules>({
   no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '入库类型不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+  orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
+  totalQuantity: [{ required: true, message: '入库数量不能为空', trigger: 'change' }],
+  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
@@ -277,8 +287,7 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
   skuCode: sku.code,
   skuName: sku.name,
   quantity: undefined,
-  amount: undefined,
-  remark: undefined
+  amount: undefined
 })
 
 /** 添加商品 */
@@ -429,6 +438,7 @@ const resetForm = () => {
     id: undefined,
     no: generateOrderNo('RK'),
     type: undefined,
+    orderTime: undefined,
     status: OrderStatusEnum.PREPARE,
     bizOrderNo: undefined,
     merchantId: undefined,
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index dbc636705..5af41b541 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -9,10 +9,11 @@
         <div>
           入库类型：{{ getDictLabel(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE, printData.type) || '-' }}
         </div>
+        <div>仓库：{{ printData.warehouseName || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>入库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
         <div>供应商：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
-        <div>仓库：{{ printData.warehouseName || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@@ -25,7 +26,6 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
           </tr>
         </thead>
         <tbody>
@@ -44,7 +44,6 @@
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
               {{ formatPrice(detail.amount) || '-' }}
             </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
           </tr>
           <tr v-if="!printData.details?.length">
             <td
@@ -71,7 +70,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
 
 const printData = ref<ReceiptOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 5
+const tableColumnCount = 4
 const printObj = ref({
   id: 'wmsReceiptOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 7f5596ede..cd965d61c 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -48,14 +48,14 @@
           supplier
         />
       </el-form-item>
-      <el-form-item label="单据日期" prop="orderDate">
+      <el-form-item label="单据日期" prop="orderTime">
         <el-date-picker
-          v-model="queryParams.orderDate"
-          :shortcuts="defaultShortcuts"
+          v-model="queryParams.orderTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束时间"
-          start-placeholder="开始时间"
-          type="datetimerange"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
@@ -247,7 +247,6 @@
                 {{ formatPrice(detailScope.row.amount) || '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" min-width="160" prop="remark" />
           </el-table>
         </template>
       </el-table-column>
@@ -458,7 +457,7 @@ const getDefaultQueryParams = () => ({
   status: undefined as number | undefined,
   warehouseId: undefined as number | undefined,
   merchantId: undefined as number | undefined,
-  orderDate: undefined as string[] | undefined,
+  orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
   totalAmountMin: undefined as number | undefined,
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 868dc0563..4d7e21297 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -5,14 +5,6 @@
       <div class="mb-16px text-18px font-bold">单据信息</div>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="出库单号">{{ detailData.no || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="单据状态">
-          <dict-tag
-            v-if="detailData.status !== undefined"
-            :type="DICT_TYPE.WMS_ORDER_STATUS"
-            :value="detailData.status"
-          />
-          <span v-else>-</span>
-        </el-descriptions-item>
         <el-descriptions-item label="出库类型">
           <dict-tag
             v-if="detailData.type !== undefined"
@@ -24,6 +16,17 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
+        <el-descriptions-item label="单据状态">
+          <dict-tag
+            v-if="detailData.status !== undefined"
+            :type="DICT_TYPE.WMS_ORDER_STATUS"
+            :value="detailData.status"
+          />
+          <span v-else>-</span>
+        </el-descriptions-item>
         <el-descriptions-item label="客户">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index cf75f4db7..876f3276a 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -26,6 +26,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="merchantId">
             <MerchantSelect
@@ -41,28 +46,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="仓库" prop="warehouseId">
-            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总数量">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -73,6 +56,34 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总数量" prop="totalQuantity">
+            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额" prop="totalAmount">
+            <el-input-number
+              v-model="formData.totalAmount"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="请输入总金额"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
@@ -137,11 +148,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="180">
-          <template #default="scope">
-            <el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="操作" width="80">
           <template #default="scope">
             <el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
@@ -197,7 +203,6 @@ import InventorySelect, {
 } from '@/views/wms/inventory/components/InventorySelect.vue'
 import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { formatNullableDate } from '@/utils/formatTime'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   formatQuantity,
@@ -223,6 +228,7 @@ const formData = ref<ShipmentOrderVO>({
   id: undefined,
   no: undefined,
   type: undefined,
+  orderTime: undefined,
   status: OrderStatusEnum.PREPARE,
   bizOrderNo: undefined,
   merchantId: undefined,
@@ -235,7 +241,10 @@ const formData = ref<ShipmentOrderVO>({
 const formRules = reactive<FormRules>({
   no: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '出库类型不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+  orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
+  totalQuantity: [{ required: true, message: '出库数量不能为空', trigger: 'change' }],
+  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const inventorySelectRef = ref() // 库存选择弹窗 Ref
@@ -291,8 +300,7 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
   warehouseName: inventory.warehouseName,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
-  amount: undefined,
-  remark: undefined
+  amount: undefined
 })
 
 /** 添加商品 */
@@ -454,6 +462,7 @@ const resetForm = () => {
     id: undefined,
     no: generateOrderNo('CK'),
     type: undefined,
+    orderTime: undefined,
     status: OrderStatusEnum.PREPARE,
     bizOrderNo: undefined,
     merchantId: undefined,
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index e3e655310..9a3de8682 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -9,10 +9,11 @@
         <div>
           出库类型：{{ getDictLabel(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE, printData.type) || '-' }}
         </div>
+        <div>仓库：{{ printData.warehouseName || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>出库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
         <div>客户：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
-        <div>仓库：{{ printData.warehouseName || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@@ -25,7 +26,6 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
           </tr>
         </thead>
         <tbody>
@@ -44,7 +44,6 @@
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
               {{ formatPrice(detail.amount) || '-' }}
             </td>
-            <td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
           </tr>
           <tr v-if="!printData.details?.length">
             <td
@@ -71,7 +70,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
 
 const printData = ref<ShipmentOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 5
+const tableColumnCount = 4
 const printObj = ref({
   id: 'wmsShipmentOrderPrint',
   popTitle: '&nbsp',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 2fcf29b51..74a88ed0c 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -48,14 +48,14 @@
           customer
         />
       </el-form-item>
-      <el-form-item label="单据日期" prop="orderDate">
+      <el-form-item label="单据日期" prop="orderTime">
         <el-date-picker
-          v-model="queryParams.orderDate"
-          :shortcuts="defaultShortcuts"
+          v-model="queryParams.orderTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束时间"
-          start-placeholder="开始时间"
-          type="datetimerange"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
@@ -247,7 +247,6 @@
                 {{ formatPrice(detailScope.row.amount) || '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" min-width="160" prop="remark" />
           </el-table>
         </template>
       </el-table-column>
@@ -458,7 +457,7 @@ const getDefaultQueryParams = () => ({
   status: undefined as number | undefined,
   warehouseId: undefined as number | undefined,
   merchantId: undefined as number | undefined,
-  orderDate: undefined as string[] | undefined,
+  orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
   totalAmountMin: undefined as number | undefined,

From 44808eb3f438d9839e4676418d5be7682f74777b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 00:02:03 +0800
Subject: [PATCH 22/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20order=5Ftime=20=E6=94=BE=E5=88=B0=E3=80=90?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=91=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/receipt/ReceiptOrderDetail.vue  |  6 ++---
 .../wms/order/receipt/ReceiptOrderForm.vue    | 22 +++++++++----------
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  2 +-
 .../order/shipment/ShipmentOrderDetail.vue    |  6 ++---
 .../wms/order/shipment/ShipmentOrderForm.vue  | 22 +++++++++----------
 .../wms/order/shipment/ShipmentOrderPrint.vue |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 9fa64c52e..a5e4e9ab1 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -16,9 +16,6 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="单据日期">
-          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
-        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -27,6 +24,9 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="供应商">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index badecb0f9..7b8b4858d 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -31,6 +31,17 @@
             <WarehouseSelect v-model="formData.warehouseId" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="供应商" prop="merchantId">
             <MerchantSelect
@@ -56,17 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="单据日期" prop="orderTime">
-            <el-date-picker
-              v-model="formData.orderTime"
-              class="!w-1/1"
-              placeholder="请选择单据日期"
-              type="date"
-              value-format="x"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 5af41b541..74941d24b 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -10,8 +10,8 @@
           入库类型：{{ getDictLabel(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE, printData.type) || '-' }}
         </div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>入库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>供应商：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 4d7e21297..96ff3f899 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -16,9 +16,6 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="单据日期">
-          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
-        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -27,6 +24,9 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="客户">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 876f3276a..48cf029b5 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -31,6 +31,17 @@
             <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="merchantId">
             <MerchantSelect
@@ -56,17 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="单据日期" prop="orderTime">
-            <el-date-picker
-              v-model="formData.orderTime"
-              class="!w-1/1"
-              placeholder="请选择单据日期"
-              type="date"
-              value-format="x"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 9a3de8682..7e1145d90 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -10,8 +10,8 @@
           出库类型：{{ getDictLabel(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE, printData.type) || '-' }}
         </div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>出库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>客户：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>

From 6f96d004a9b2a7f99018bc2705fcb214a61f4719 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 08:39:04 +0800
Subject: [PATCH 23/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=E3=80=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E4=B8=8E=E4=BA=A4=E4=BA=92=E3=80=82?=
 =?UTF-8?q?=EF=BC=88=E5=89=8D=E7=AB=AF=E8=B4=9F=E8=B4=A3=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=B4=9F=E8=B4=A3=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/history/index.ts        |   2 +-
 src/api/wms/order/receipt/detail/index.ts     |   3 +-
 src/api/wms/order/receipt/index.ts            |   2 +-
 src/views/wms/inventory/history/index.vue     |   8 +-
 .../wms/order/receipt/ReceiptOrderDetail.vue  |  25 +--
 .../wms/order/receipt/ReceiptOrderForm.vue    | 151 ++++++++++++------
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  43 ++++-
 src/views/wms/order/receipt/index.vue         |  27 +++-
 8 files changed, 178 insertions(+), 83 deletions(-)

diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
index 10a997d7b..76345ae99 100644
--- a/src/api/wms/inventory/history/index.ts
+++ b/src/api/wms/inventory/history/index.ts
@@ -15,7 +15,7 @@ export interface InventoryHistoryVO {
   quantity?: number
   beforeQuantity?: number
   afterQuantity?: number
-  amount?: number
+  price?: number
   remark?: string
   orderId?: number
   orderNo?: string
diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
index f957d52cf..582bc7977 100644
--- a/src/api/wms/order/receipt/detail/index.ts
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -12,6 +12,7 @@ export interface ReceiptOrderDetailVO {
   warehouseId?: number
   warehouseName?: string
   quantity?: number
-  amount?: number
+  price?: number
+  totalPrice?: number
   createTime?: Date
 }
diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts
index 1c1b4a393..4965112ec 100644
--- a/src/api/wms/order/receipt/index.ts
+++ b/src/api/wms/order/receipt/index.ts
@@ -15,7 +15,7 @@ export interface ReceiptOrderVO {
   warehouseId?: number
   warehouseName?: string
   totalQuantity?: number
-  totalAmount?: number
+  totalPrice?: number
   details?: ReceiptOrderDetailVO[]
   createTime?: Date
   creator?: string
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index 2ee3a5e07..4d0aaf673 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -144,15 +144,15 @@
           {{ formatQuantity(scope.row.afterQuantity) || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="数量/金额(元)" min-width="150">
+      <el-table-column label="数量/单价(元)" min-width="150">
         <template #default="scope">
           <div class="flex justify-between">
             <span>数量：</span>
             <span>{{ formatQuantity(scope.row.quantity) }}</span>
           </div>
-          <div v-if="scope.row.amount || scope.row.amount === 0" class="flex justify-between">
-            <span>金额：</span>
-            <span>{{ formatPrice(scope.row.amount) }}</span>
+          <div v-if="scope.row.price || scope.row.price === 0" class="flex justify-between">
+            <span>单价：</span>
+            <span>{{ formatPrice(scope.row.price) }}</span>
           </div>
         </template>
       </el-table-column>
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index a5e4e9ab1..d625baa02 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -37,7 +37,7 @@
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="总金额">
-          {{ formatPrice(detailData.totalAmount) || '-' }}
+          {{ formatPrice(detailData.totalPrice) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="创建时间">
           {{ formatNullableDate(detailData.createTime) }}
@@ -80,14 +80,14 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" width="100" />
-        <el-table-column align="right" label="单价" prop="unitPrice" width="140">
+        <el-table-column align="right" label="单价" prop="price" width="140">
           <template #default="scope">
-            {{ formatPrice(scope.row.unitPrice) || '-' }}
+            {{ formatPrice(scope.row.price) || '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="总价" prop="amount" width="140">
+        <el-table-column align="right" label="总价" prop="totalPrice" width="140">
           <template #default="scope">
-            {{ formatPrice(scope.row.amount) || '-' }}
+            {{ formatPrice(scope.row.totalPrice) || '-' }}
           </template>
         </el-table-column>
       </el-table>
@@ -111,7 +111,7 @@ import {
 defineOptions({ name: 'WmsReceiptOrderDetail' })
 
 interface DetailRow extends ReceiptOrderDetailVO {
-  unitPrice?: number
+  totalPrice?: number
 }
 
 const loading = ref(false) // 加载中
@@ -120,9 +120,9 @@ const detailData = ref<ReceiptOrderVO>({}) // 详情数据
 const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
-    unitPrice:
-      detail.amount != null && detail.quantity
-        ? Number(detail.amount) / Number(detail.quantity)
+    totalPrice:
+      detail.price != null && detail.quantity
+        ? Number(detail.price) * Number(detail.quantity)
         : undefined
   }))
 )
@@ -135,8 +135,11 @@ const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] })
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'amount') {
-      return formatSumPrice(data, (detail) => detail.amount)
+    if (column.property === 'price') {
+      return formatSumPrice(data, (detail) => detail.price)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
     }
     return ''
   })
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index 7b8b4858d..eb5e672f7 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -56,7 +56,7 @@
             <el-input v-model="formData.bizOrderNo" maxlength="64" placeholder="请输入业务单号" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -67,23 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="总数量" prop="totalQuantity">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额" prop="totalAmount">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
@@ -101,7 +84,13 @@
           </span>
         </el-tooltip>
       </div>
-      <el-table :data="formData.details" border empty-text="暂无商品明细">
+      <el-table
+        :data="formData.details"
+        :summary-method="getDetailSummaries"
+        border
+        empty-text="暂无商品明细"
+        show-summary
+      >
         <el-table-column label="商品信息" min-width="220">
           <template #default="scope">
             <div>{{ scope.row.itemName || '-' }}</div>
@@ -118,7 +107,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="入库数量" width="160">
+        <el-table-column label="入库数量" prop="quantity" width="160">
           <template #default="scope">
             <el-input-number
               v-model="scope.row.quantity"
@@ -127,19 +116,33 @@
               :precision="QUANTITY_PRECISION"
               class="!w-1/1"
               placeholder="数量"
+              @change="handleDetailQuantityChange(scope.row)"
             />
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" width="160">
+        <el-table-column label="单价(元)" prop="price" width="160">
           <template #default="scope">
             <el-input-number
-              v-model="scope.row.amount"
+              v-model="scope.row.price"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="单价"
+              @change="handleDetailPriceChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" prop="totalPrice" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.totalPrice"
               :controls="false"
               :min="0"
               :precision="PRICE_PRECISION"
               class="!w-1/1"
               placeholder="金额"
-              @change="handleDetailAmountChange"
+              @change="handleDetailTotalPriceChange(scope.row)"
             />
           </template>
         </el-table-column>
@@ -195,11 +198,12 @@ import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vu
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
-  formatQuantity,
+  formatPrice,
+  formatSumPrice,
+  formatSumQuantity,
   PRICE_PRECISION,
   QUANTITY_PRECISION,
-  sumPrice,
-  sumQuantity
+  sumPrice
 } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
@@ -223,8 +227,6 @@ const formData = ref<ReceiptOrderVO>({
   bizOrderNo: undefined,
   merchantId: undefined,
   warehouseId: undefined,
-  totalQuantity: 0,
-  totalAmount: 0,
   remark: undefined,
   details: []
 })
@@ -232,15 +234,12 @@ const formRules = reactive<FormRules>({
   no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '入库类型不能为空', trigger: 'change' }],
   orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
-  totalQuantity: [{ required: true, message: '入库数量不能为空', trigger: 'change' }],
-  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
 
-const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
-const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -266,7 +265,7 @@ const open = async (type: string, id?: number) => {
       const order = await ReceiptOrderApi.getReceiptOrder(id)
       formData.value = {
         ...order,
-        details: order.details || []
+        details: normalizeDetails(order.details || [])
       }
     } finally {
       formLoading.value = false
@@ -287,9 +286,34 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
   skuCode: sku.code,
   skuName: sku.name,
   quantity: undefined,
-  amount: undefined
+  price: undefined,
+  totalPrice: undefined
 })
 
+const normalizeDetails = (details: ReceiptOrderDetailVO[]) =>
+  details.map((detail) => ({
+    ...detail,
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
+  }))
+
+const roundPrice = (value: number) => {
+  return Number.isFinite(value) ? Number(value.toFixed(PRICE_PRECISION)) : undefined
+}
+
+const multiplyPrice = (quantity?: number, price?: number) => {
+  if (!quantity || price === undefined || price === null) {
+    return undefined
+  }
+  return roundPrice(Number(quantity) * Number(price))
+}
+
+const dividePrice = (totalPrice?: number, quantity?: number) => {
+  if (totalPrice === undefined || totalPrice === null || !quantity) {
+    return undefined
+  }
+  return roundPrice(Number(totalPrice) / Number(quantity))
+}
+
 /** 添加商品 */
 const handleAddDetail = () => {
   skuSelectRef.value?.open(getSelectedSkuIds())
@@ -309,7 +333,6 @@ const handleSelectSku = (skus: ItemSkuVO[]) => {
     formData.value.details!.push(buildDetail(sku))
     selectedSkuIds.add(sku.id)
   })
-  refreshTotalAmount()
 }
 
 /** 获得已选 SKU 编号 */
@@ -322,18 +345,44 @@ const getSelectedSkuIds = () => {
 /** 删除明细 */
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
-  refreshTotalAmount()
+}
+
+/** 明细数量变化 */
+const handleDetailQuantityChange = (detail: ReceiptOrderDetailVO) => {
+  if (detail.price !== undefined && detail.price !== null) {
+    detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
+    return
+  }
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
+}
+
+/** 明细单价变化 */
+const handleDetailPriceChange = (detail: ReceiptOrderDetailVO) => {
+  detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
 }
 
 /** 明细金额变化 */
-const handleDetailAmountChange = () => {
-  refreshTotalAmount()
+const handleDetailTotalPriceChange = (detail: ReceiptOrderDetailVO) => {
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
-/** 汇总明细金额 */
-const refreshTotalAmount = () => {
-  formData.value.totalAmount = detailTotalAmount.value
-}
+/** 明细合计 */
+const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ReceiptOrderDetailVO[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'price') {
+      return formatPrice(detailPriceSum.value)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
+    }
+    return ''
+  })
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
@@ -359,13 +408,13 @@ const validateDetails = (required: boolean) => {
 }
 
 /** 构建提交数据 */
-const buildSubmitData = () =>
-  ({
-    ...formData.value,
-    totalQuantity: totalQuantity.value,
-    totalAmount: formData.value.totalAmount,
-    details: formData.value.details || []
-  }) as ReceiptOrderVO
+const buildSubmitData = () => {
+  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  return {
+    ...order,
+    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+  } as ReceiptOrderVO
+}
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
@@ -443,8 +492,6 @@ const resetForm = () => {
     bizOrderNo: undefined,
     merchantId: undefined,
     warehouseId: undefined,
-    totalQuantity: 0,
-    totalAmount: 0,
     remark: undefined,
     details: []
   }
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 74941d24b..e7af1d5d9 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -15,7 +15,7 @@
         <div>供应商：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
-        <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
+        <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
@@ -25,11 +25,12 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
           </tr>
         </thead>
         <tbody>
-          <tr v-for="detail in printData.details || []" :key="detail.id">
+          <tr v-for="detail in printRows" :key="detail.id">
             <td class="border border-solid border-#dcdfe6 p-8px">
               <div>{{ detail.itemName || '-' }}</div>
               <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
@@ -42,10 +43,25 @@
               {{ formatQuantity(detail.quantity) || '-' }}
             </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
-              {{ formatPrice(detail.amount) || '-' }}
+              {{ formatPrice(detail.price) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.totalPrice) || '-' }}
             </td>
           </tr>
-          <tr v-if="!printData.details?.length">
+          <tr v-if="printRows.length">
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px" colspan="2">合计</td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.price) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}
+            </td>
+          </tr>
+          <tr v-if="!printRows.length">
             <td
               class="border border-solid border-#dcdfe6 p-8px text-center"
               :colspan="tableColumnCount"
@@ -63,14 +79,15 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
-import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
+import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 入库单打印 */
 defineOptions({ name: 'WmsReceiptOrderPrint' })
 
 const printData = ref<ReceiptOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 4
+const tableColumnCount = 5
 const printObj = ref({
   id: 'wmsReceiptOrderPrint',
   popTitle: '&nbsp',
@@ -79,6 +96,20 @@ const printObj = ref({
   zIndex: 20003
 })
 
+interface PrintRow extends ReceiptOrderDetailVO {
+  totalPrice?: number
+}
+
+const printRows = computed<PrintRow[]>(() =>
+  (printData.value.details || []).map((detail) => ({
+    ...detail,
+    totalPrice:
+      detail.price != null && detail.quantity
+        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
+        : undefined
+  }))
+)
+
 /** 打印入库单 */
 const print = async (id: number) => {
   printData.value = await ReceiptOrderApi.getReceiptOrder(id)
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index cd965d61c..5dd619a11 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -80,10 +80,10 @@
           />
         </div>
       </el-form-item>
-      <el-form-item label="总金额" prop="totalAmountMin">
+      <el-form-item label="总金额" prop="totalPriceMin">
         <div class="flex w-240px items-center gap-8px">
           <el-input-number
-            v-model="queryParams.totalAmountMin"
+            v-model="queryParams.totalPriceMin"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -92,7 +92,7 @@
           />
           <span>至</span>
           <el-input-number
-            v-model="queryParams.totalAmountMax"
+            v-model="queryParams.totalPriceMax"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -242,9 +242,14 @@
                 {{ formatQuantity(detailScope.row.quantity) }}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="单价(元)" width="120">
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.price) || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="金额(元)" width="120">
               <template #default="detailScope">
-                {{ formatPrice(detailScope.row.amount) || '-' }}
+                {{ formatPrice(getDetailTotalPrice(detailScope.row)) || '-' }}
               </template>
             </el-table-column>
           </el-table>
@@ -305,7 +310,7 @@
           </div>
           <div class="flex items-center justify-between">
             <span>金额：</span>
-            <span>{{ formatPrice(scope.row.totalAmount) }}</span>
+            <span>{{ formatPrice(scope.row.totalPrice) }}</span>
           </div>
         </template>
       </el-table-column>
@@ -460,8 +465,8 @@ const getDefaultQueryParams = () => ({
   orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
-  totalAmountMin: undefined as number | undefined,
-  totalAmountMax: undefined as number | undefined,
+  totalPriceMin: undefined as number | undefined,
+  totalPriceMax: undefined as number | undefined,
   type: undefined as number | undefined,
   bizOrderNo: undefined as string | undefined,
   creator: undefined as number | undefined,
@@ -532,6 +537,14 @@ const handleWarehouseChange = () => {
   handleQuery()
 }
 
+/** 计算明细金额 */
+const getDetailTotalPrice = (detail: ReceiptOrderDetailVO) => {
+  if (!detail.quantity || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return Number(detail.quantity) * Number(detail.price)
+}
+
 /** 展开明细 */
 const handleExpandChange = async (row: ReceiptOrderVO) => {
   if (!row.id || detailMap[row.id]) {

From df013ac69c9deb3ca5c47462604aae99ed0220e6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 09:07:26 +0800
Subject: [PATCH 24/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=E3=80=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E4=B8=8E=E4=BA=A4=E4=BA=92=E3=80=82?=
 =?UTF-8?q?=EF=BC=88=E5=89=8D=E7=AB=AF=E8=B4=9F=E8=B4=A3=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=B4=9F=E8=B4=A3=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/shipment/detail/index.ts    |   3 +-
 src/api/wms/order/shipment/index.ts           |   2 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    |  20 +--
 .../order/shipment/ShipmentOrderDetail.vue    |  25 ++--
 .../wms/order/shipment/ShipmentOrderForm.vue  | 135 +++++++++++-------
 .../wms/order/shipment/ShipmentOrderPrint.vue |  43 +++++-
 src/views/wms/order/shipment/index.vue        |  27 +++-
 src/views/wms/utils/format.ts                 |  21 +++
 8 files changed, 180 insertions(+), 96 deletions(-)

diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 30e48f4da..4f2d5c0e9 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -13,6 +13,7 @@ export interface ShipmentOrderDetailVO {
   warehouseName?: string
   quantity?: number
   availableQuantity?: number
-  amount?: number
+  price?: number
+  totalPrice?: number
   createTime?: Date
 }
diff --git a/src/api/wms/order/shipment/index.ts b/src/api/wms/order/shipment/index.ts
index ccbcfb85b..2f1b0ea49 100644
--- a/src/api/wms/order/shipment/index.ts
+++ b/src/api/wms/order/shipment/index.ts
@@ -15,7 +15,7 @@ export interface ShipmentOrderVO {
   warehouseId?: number
   warehouseName?: string
   totalQuantity?: number
-  totalAmount?: number
+  totalPrice?: number
   details?: ShipmentOrderDetailVO[]
   createTime?: Date
   creator?: string
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index eb5e672f7..cbf74e395 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -198,9 +198,11 @@ import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vu
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
+  dividePrice,
   formatPrice,
   formatSumPrice,
   formatSumQuantity,
+  multiplyPrice,
   PRICE_PRECISION,
   QUANTITY_PRECISION,
   sumPrice
@@ -296,24 +298,6 @@ const normalizeDetails = (details: ReceiptOrderDetailVO[]) =>
     totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 
-const roundPrice = (value: number) => {
-  return Number.isFinite(value) ? Number(value.toFixed(PRICE_PRECISION)) : undefined
-}
-
-const multiplyPrice = (quantity?: number, price?: number) => {
-  if (!quantity || price === undefined || price === null) {
-    return undefined
-  }
-  return roundPrice(Number(quantity) * Number(price))
-}
-
-const dividePrice = (totalPrice?: number, quantity?: number) => {
-  if (totalPrice === undefined || totalPrice === null || !quantity) {
-    return undefined
-  }
-  return roundPrice(Number(totalPrice) / Number(quantity))
-}
-
 /** 添加商品 */
 const handleAddDetail = () => {
   skuSelectRef.value?.open(getSelectedSkuIds())
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 96ff3f899..42b75317f 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -37,7 +37,7 @@
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="总金额">
-          {{ formatPrice(detailData.totalAmount) || '-' }}
+          {{ formatPrice(detailData.totalPrice) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="创建时间">
           {{ formatNullableDate(detailData.createTime) }}
@@ -80,14 +80,14 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" width="100" />
-        <el-table-column align="right" label="单价" prop="unitPrice" width="140">
+        <el-table-column align="right" label="单价" prop="price" width="140">
           <template #default="scope">
-            {{ formatPrice(scope.row.unitPrice) || '-' }}
+            {{ formatPrice(scope.row.price) || '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="总价" prop="amount" width="140">
+        <el-table-column align="right" label="总价" prop="totalPrice" width="140">
           <template #default="scope">
-            {{ formatPrice(scope.row.amount) || '-' }}
+            {{ formatPrice(scope.row.totalPrice) || '-' }}
           </template>
         </el-table-column>
       </el-table>
@@ -111,7 +111,7 @@ import {
 defineOptions({ name: 'WmsShipmentOrderDetail' })
 
 interface DetailRow extends ShipmentOrderDetailVO {
-  unitPrice?: number
+  totalPrice?: number
 }
 
 const loading = ref(false) // 加载中
@@ -120,9 +120,9 @@ const detailData = ref<ShipmentOrderVO>({}) // 详情数据
 const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
-    unitPrice:
-      detail.amount != null && detail.quantity
-        ? Number(detail.amount) / Number(detail.quantity)
+    totalPrice:
+      detail.price != null && detail.quantity
+        ? Number(detail.price) * Number(detail.quantity)
         : undefined
   }))
 )
@@ -135,8 +135,11 @@ const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] })
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'amount') {
-      return formatSumPrice(data, (detail) => detail.amount)
+    if (column.property === 'price') {
+      return formatSumPrice(data, (detail) => detail.price)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
     }
     return ''
   })
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 48cf029b5..793ab2b86 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -56,7 +56,7 @@
             <el-input v-model="formData.bizOrderNo" maxlength="64" placeholder="请输入业务单号" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="formData.remark"
@@ -67,23 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="总数量" prop="totalQuantity">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额" prop="totalAmount">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
@@ -101,7 +84,13 @@
           </span>
         </el-tooltip>
       </div>
-      <el-table :data="formData.details" border empty-text="暂无商品明细">
+      <el-table
+        :data="formData.details"
+        :summary-method="getDetailSummaries"
+        border
+        empty-text="暂无商品明细"
+        show-summary
+      >
         <el-table-column label="商品信息" min-width="220">
           <template #default="scope">
             <div>{{ scope.row.itemName || '-' }}</div>
@@ -123,7 +112,7 @@
             {{ formatQuantity(scope.row.availableQuantity) || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出库数量" width="160">
+        <el-table-column label="出库数量" prop="quantity" width="160">
           <template #default="scope">
             <el-input-number
               v-model="scope.row.quantity"
@@ -132,19 +121,33 @@
               :precision="QUANTITY_PRECISION"
               class="!w-1/1"
               placeholder="数量"
+              @change="handleDetailQuantityChange(scope.row)"
             />
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" width="160">
+        <el-table-column label="单价(元)" prop="price" width="160">
           <template #default="scope">
             <el-input-number
-              v-model="scope.row.amount"
+              v-model="scope.row.price"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="单价"
+              @change="handleDetailPriceChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" prop="totalPrice" width="160">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.totalPrice"
               :controls="false"
               :min="0"
               :precision="PRICE_PRECISION"
               class="!w-1/1"
               placeholder="金额"
-              @change="handleDetailAmountChange"
+              @change="handleDetailTotalPriceChange(scope.row)"
             />
           </template>
         </el-table-column>
@@ -205,11 +208,15 @@ import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vu
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
+  dividePrice,
+  formatPrice,
   formatQuantity,
+  formatSumPrice,
+  formatSumQuantity,
+  multiplyPrice,
   PRICE_PRECISION,
   QUANTITY_PRECISION,
-  sumPrice,
-  sumQuantity
+  sumPrice
 } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
@@ -233,8 +240,6 @@ const formData = ref<ShipmentOrderVO>({
   bizOrderNo: undefined,
   merchantId: undefined,
   warehouseId: undefined,
-  totalQuantity: 0,
-  totalAmount: 0,
   remark: undefined,
   details: []
 })
@@ -242,15 +247,12 @@ const formRules = reactive<FormRules>({
   no: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '出库类型不能为空', trigger: 'change' }],
   orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
-  totalQuantity: [{ required: true, message: '出库数量不能为空', trigger: 'change' }],
-  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 const inventorySelectRef = ref() // 库存选择弹窗 Ref
 
-const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
-const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -276,7 +278,7 @@ const open = async (type: string, id?: number) => {
       const order = await ShipmentOrderApi.getShipmentOrder(id)
       formData.value = {
         ...order,
-        details: order.details || []
+        details: normalizeDetails(order.details || [])
       }
     } finally {
       formLoading.value = false
@@ -300,9 +302,16 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
   warehouseName: inventory.warehouseName,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
-  amount: undefined
+  price: undefined,
+  totalPrice: undefined
 })
 
+const normalizeDetails = (details: ShipmentOrderDetailVO[]) =>
+  details.map((detail) => ({
+    ...detail,
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
+  }))
+
 /** 添加商品 */
 const handleAddDetail = () => {
   inventorySelectRef.value?.open()
@@ -320,7 +329,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
     }
     formData.value.details!.push(buildDetail(inventory))
   })
-  refreshTotalAmount()
 }
 
 /** 判断库存是否已选择 */
@@ -336,24 +344,49 @@ const isInventorySelected = (inventory: InventorySelectRow) => {
 /** 删除明细 */
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
-  refreshTotalAmount()
 }
 
 /** 仓库变化 */
 const handleWarehouseChange = () => {
   formData.value.details = []
-  refreshTotalAmount()
+}
+
+/** 明细数量变化 */
+const handleDetailQuantityChange = (detail: ShipmentOrderDetailVO) => {
+  if (detail.price !== undefined && detail.price !== null) {
+    detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
+    return
+  }
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
+}
+
+/** 明细单价变化 */
+const handleDetailPriceChange = (detail: ShipmentOrderDetailVO) => {
+  detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
 }
 
 /** 明细金额变化 */
-const handleDetailAmountChange = () => {
-  refreshTotalAmount()
+const handleDetailTotalPriceChange = (detail: ShipmentOrderDetailVO) => {
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
-/** 汇总明细金额 */
-const refreshTotalAmount = () => {
-  formData.value.totalAmount = detailTotalAmount.value
-}
+/** 明细合计 */
+const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ShipmentOrderDetailVO[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'price') {
+      return formatPrice(detailPriceSum.value)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
+    }
+    return ''
+  })
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
@@ -383,13 +416,13 @@ const validateDetails = (required: boolean) => {
 }
 
 /** 构建提交数据 */
-const buildSubmitData = () =>
-  ({
-    ...formData.value,
-    totalQuantity: totalQuantity.value,
-    totalAmount: formData.value.totalAmount,
-    details: formData.value.details || []
-  }) as ShipmentOrderVO
+const buildSubmitData = () => {
+  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  return {
+    ...order,
+    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+  } as ShipmentOrderVO
+}
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
@@ -467,8 +500,6 @@ const resetForm = () => {
     bizOrderNo: undefined,
     merchantId: undefined,
     warehouseId: undefined,
-    totalQuantity: 0,
-    totalAmount: 0,
     remark: undefined,
     details: []
   }
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 7e1145d90..b60f12dd5 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -15,7 +15,7 @@
         <div>客户：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
-        <div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
+        <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
         <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
@@ -25,11 +25,12 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
           </tr>
         </thead>
         <tbody>
-          <tr v-for="detail in printData.details || []" :key="detail.id">
+          <tr v-for="detail in printRows" :key="detail.id">
             <td class="border border-solid border-#dcdfe6 p-8px">
               <div>{{ detail.itemName || '-' }}</div>
               <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
@@ -42,10 +43,25 @@
               {{ formatQuantity(detail.quantity) || '-' }}
             </td>
             <td class="border border-solid border-#dcdfe6 p-8px text-right">
-              {{ formatPrice(detail.amount) || '-' }}
+              {{ formatPrice(detail.price) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.totalPrice) || '-' }}
             </td>
           </tr>
-          <tr v-if="!printData.details?.length">
+          <tr v-if="printRows.length">
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px" colspan="2">合计</td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.price) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}
+            </td>
+          </tr>
+          <tr v-if="!printRows.length">
             <td
               class="border border-solid border-#dcdfe6 p-8px text-center"
               :colspan="tableColumnCount"
@@ -63,14 +79,15 @@
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
-import { formatPrice, formatQuantity } from '@/views/wms/utils/format'
+import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
+import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
 
 /** WMS 出库单打印 */
 defineOptions({ name: 'WmsShipmentOrderPrint' })
 
 const printData = ref<ShipmentOrderVO>({}) // 打印数据
 const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
-const tableColumnCount = 4
+const tableColumnCount = 5
 const printObj = ref({
   id: 'wmsShipmentOrderPrint',
   popTitle: '&nbsp',
@@ -79,6 +96,20 @@ const printObj = ref({
   zIndex: 20003
 })
 
+interface PrintRow extends ShipmentOrderDetailVO {
+  totalPrice?: number
+}
+
+const printRows = computed<PrintRow[]>(() =>
+  (printData.value.details || []).map((detail) => ({
+    ...detail,
+    totalPrice:
+      detail.price != null && detail.quantity
+        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
+        : undefined
+  }))
+)
+
 /** 打印出库单 */
 const print = async (id: number) => {
   printData.value = await ShipmentOrderApi.getShipmentOrder(id)
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 74a88ed0c..1b4af26f4 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -80,10 +80,10 @@
           />
         </div>
       </el-form-item>
-      <el-form-item label="总金额" prop="totalAmountMin">
+      <el-form-item label="总金额" prop="totalPriceMin">
         <div class="flex w-240px items-center gap-8px">
           <el-input-number
-            v-model="queryParams.totalAmountMin"
+            v-model="queryParams.totalPriceMin"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -92,7 +92,7 @@
           />
           <span>至</span>
           <el-input-number
-            v-model="queryParams.totalAmountMax"
+            v-model="queryParams.totalPriceMax"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -242,9 +242,14 @@
                 {{ formatQuantity(detailScope.row.quantity) }}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="单价(元)" width="120">
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.price) || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="金额(元)" width="120">
               <template #default="detailScope">
-                {{ formatPrice(detailScope.row.amount) || '-' }}
+                {{ formatPrice(getDetailTotalPrice(detailScope.row)) || '-' }}
               </template>
             </el-table-column>
           </el-table>
@@ -305,7 +310,7 @@
           </div>
           <div class="flex items-center justify-between">
             <span>金额：</span>
-            <span>{{ formatPrice(scope.row.totalAmount) }}</span>
+            <span>{{ formatPrice(scope.row.totalPrice) }}</span>
           </div>
         </template>
       </el-table-column>
@@ -460,8 +465,8 @@ const getDefaultQueryParams = () => ({
   orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
-  totalAmountMin: undefined as number | undefined,
-  totalAmountMax: undefined as number | undefined,
+  totalPriceMin: undefined as number | undefined,
+  totalPriceMax: undefined as number | undefined,
   type: undefined as number | undefined,
   bizOrderNo: undefined as string | undefined,
   creator: undefined as number | undefined,
@@ -532,6 +537,14 @@ const handleWarehouseChange = () => {
   handleQuery()
 }
 
+/** 计算明细金额 */
+const getDetailTotalPrice = (detail: ShipmentOrderDetailVO) => {
+  if (!detail.quantity || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return Number(detail.quantity) * Number(detail.price)
+}
+
 /** 展开明细 */
 const handleExpandChange = async (row: ShipmentOrderVO) => {
   if (!row.id || detailMap[row.id]) {
diff --git a/src/views/wms/utils/format.ts b/src/views/wms/utils/format.ts
index 4f2a3b338..b5dd5d780 100644
--- a/src/views/wms/utils/format.ts
+++ b/src/views/wms/utils/format.ts
@@ -48,6 +48,27 @@ export const formatPrice = (value?: number | string | null) => {
   return decimalValue === undefined ? '' : decimalValue.toFixed(PRICE_PRECISION)
 }
 
+/** 金额四舍五入 */
+export const roundPrice = (value: number) => {
+  return Number.isFinite(value) ? Number(value.toFixed(PRICE_PRECISION)) : undefined
+}
+
+/** 数量 * 单价，计算金额 */
+export const multiplyPrice = (quantity?: number, price?: number) => {
+  if (!quantity || price === undefined || price === null) {
+    return undefined
+  }
+  return roundPrice(Number(quantity) * Number(price))
+}
+
+/** 金额 / 数量，反算单价 */
+export const dividePrice = (totalPrice?: number, quantity?: number) => {
+  if (totalPrice === undefined || totalPrice === null || !quantity) {
+    return undefined
+  }
+  return roundPrice(Number(totalPrice) / Number(quantity))
+}
+
 /** 汇总数量 */
 export const sumQuantity = <T>(list: T[], getter: (item: T) => DecimalValue) => {
   return sumDecimal(list, getter)

From eaedb1e0ca078de8ab39a3b1a263b6a77de567e5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 09:46:19 +0800
Subject: [PATCH 25/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E7=A7=BB=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=E3=80=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E4=B8=8E=E4=BA=A4=E4=BA=92=E3=80=82?=
 =?UTF-8?q?=EF=BC=88=E5=89=8D=E7=AB=AF=E8=B4=9F=E8=B4=A3=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=B4=9F=E8=B4=A3=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/movement/detail/index.ts    |   3 +-
 src/api/wms/order/movement/index.ts           |   2 +-
 .../order/movement/MovementOrderDetail.vue    |  30 +++-
 .../wms/order/movement/MovementOrderForm.vue  | 134 ++++++++++++------
 src/views/wms/order/movement/index.vue        |  23 ++-
 5 files changed, 130 insertions(+), 62 deletions(-)

diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index df7a1d228..accd5fe93 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -15,6 +15,7 @@ export interface MovementOrderDetailVO {
   targetWarehouseName?: string
   quantity?: number
   availableQuantity?: number
-  amount?: number
+  price?: number
+  totalPrice?: number
   createTime?: Date
 }
diff --git a/src/api/wms/order/movement/index.ts b/src/api/wms/order/movement/index.ts
index 8542dd2e0..20204fbc4 100644
--- a/src/api/wms/order/movement/index.ts
+++ b/src/api/wms/order/movement/index.ts
@@ -13,7 +13,7 @@ export interface MovementOrderVO {
   targetWarehouseId?: number
   targetWarehouseName?: string
   totalQuantity?: number
-  totalAmount?: number
+  totalPrice?: number
   details?: MovementOrderDetailVO[]
   createTime?: Date
   creator?: string
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index f71552113..4c83b2e95 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -26,7 +26,7 @@
           {{ formatQuantity(detailData.totalQuantity) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="总金额">
-          {{ formatPrice(detailData.totalAmount) || '-' }}
+          {{ formatPrice(detailData.totalPrice) || '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="创建时间">
           {{ formatNullableDate(detailData.createTime) }}
@@ -46,7 +46,7 @@
       </el-descriptions>
 
       <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
-      <el-table :data="detailData.details || []" :summary-method="getSummaries" border show-summary>
+      <el-table :data="detailRows" :summary-method="getSummaries" border show-summary>
         <el-table-column label="商品信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
@@ -62,8 +62,11 @@
         <el-table-column align="right" label="数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
-        <el-table-column align="right" label="金额(元)" prop="amount" width="140">
-          <template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
+        <el-table-column align="right" label="单价(元)" prop="price" width="140">
+          <template #default="{ row }">{{ formatPrice(row.price) || '-' }}</template>
+        </el-table-column>
+        <el-table-column align="right" label="金额(元)" prop="totalPrice" width="140">
+          <template #default="{ row }">{{ formatPrice(row.totalPrice) || '-' }}</template>
         </el-table-column>
       </el-table>
     </div>
@@ -84,11 +87,26 @@ const loading = ref(false)
 const dialogVisible = ref(false)
 const detailData = ref<MovementOrderVO>({})
 
-const getSummaries = ({ columns, data }: { columns: any[]; data: MovementOrderDetailVO[] }) =>
+interface DetailRow extends MovementOrderDetailVO {
+  totalPrice?: number
+}
+
+const detailRows = computed<DetailRow[]>(() =>
+  (detailData.value.details || []).map((detail) => ({
+    ...detail,
+    totalPrice:
+      detail.price != null && detail.quantity
+        ? Number(detail.price) * Number(detail.quantity)
+        : undefined
+  }))
+)
+
+const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
   columns.map((column, index) => {
     if (index === 0) return '合计'
     if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
-    if (column.property === 'amount') return formatSumPrice(data, (detail) => detail.amount)
+    if (column.property === 'price') return formatSumPrice(data, (detail) => detail.price)
+    if (column.property === 'totalPrice') return formatSumPrice(data, (detail) => detail.totalPrice)
     return ''
   })
 
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 434df2391..bee09c6ab 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -29,24 +29,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="总数量" prop="totalQuantity">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额" prop="totalAmount">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
           </el-form-item>
@@ -64,7 +47,13 @@
           </span>
         </el-tooltip>
       </div>
-      <el-table :data="formData.details" border empty-text="暂无商品明细">
+      <el-table
+        :data="formData.details"
+        :summary-method="getDetailSummaries"
+        border
+        empty-text="暂无商品明细"
+        show-summary
+      >
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
@@ -80,7 +69,7 @@
         <el-table-column align="right" label="可用库存" width="120">
           <template #default="{ row }">{{ formatQuantity(row.availableQuantity) || '-' }}</template>
         </el-table-column>
-        <el-table-column label="移库数量" width="160">
+        <el-table-column label="移库数量" prop="quantity" width="160">
           <template #default="{ row }">
             <el-input-number
               v-model="row.quantity"
@@ -89,19 +78,33 @@
               :precision="QUANTITY_PRECISION"
               class="!w-1/1"
               placeholder="数量"
+              @change="handleDetailQuantityChange(row)"
             />
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" width="160">
+        <el-table-column label="单价(元)" prop="price" width="160">
           <template #default="{ row }">
             <el-input-number
-              v-model="row.amount"
+              v-model="row.price"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="单价"
+              @change="handleDetailPriceChange(row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="金额(元)" prop="totalPrice" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.totalPrice"
               :controls="false"
               :min="0"
               :precision="PRICE_PRECISION"
               class="!w-1/1"
               placeholder="金额"
-              @change="refreshTotalAmount"
+              @change="handleDetailTotalPriceChange(row)"
             />
           </template>
         </el-table-column>
@@ -155,7 +158,17 @@ import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice, sumQuantity } from '@/views/wms/utils/format'
+import {
+  dividePrice,
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity,
+  multiplyPrice,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION,
+  sumPrice
+} from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
 /** WMS 移库单表单 */
@@ -176,8 +189,6 @@ const formData = ref<MovementOrderVO>({
   status: OrderStatusEnum.PREPARE,
   sourceWarehouseId: undefined,
   targetWarehouseId: undefined,
-  totalQuantity: 0,
-  totalAmount: 0,
   remark: undefined,
   details: []
 })
@@ -185,15 +196,12 @@ const formRules = reactive<FormRules>({
   no: [{ required: true, message: '移库单号不能为空', trigger: 'blur' }],
   orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
   sourceWarehouseId: [{ required: true, message: '来源仓库不能为空', trigger: 'change' }],
-  targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }],
-  totalQuantity: [{ required: true, message: '移库数量不能为空', trigger: 'change' }],
-  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
+  targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }]
 })
 const formRef = ref()
 const inventorySelectRef = ref()
 
-const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => detail.quantity))
-const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -216,7 +224,7 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       const order = await MovementOrderApi.getMovementOrder(id)
-      formData.value = { ...order, details: order.details || [] }
+      formData.value = { ...order, details: normalizeDetails(order.details || []) }
     } finally {
       formLoading.value = false
     }
@@ -240,9 +248,16 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
   targetWarehouseId: formData.value.targetWarehouseId,
   quantity: undefined,
   availableQuantity: inventory.availableQuantity,
-  amount: undefined
+  price: undefined,
+  totalPrice: undefined
 })
 
+const normalizeDetails = (details: MovementOrderDetailVO[]) =>
+  details.map((detail) => ({
+    ...detail,
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
+  }))
+
 const handleAddDetail = () => inventorySelectRef.value?.open()
 
 /** 选择库存 */
@@ -253,7 +268,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
     if (isInventorySelected(inventory)) return
     formData.value.details!.push(buildDetail(inventory))
   })
-  refreshTotalAmount()
 }
 
 /** 判断库存是否已选择 */
@@ -267,12 +281,10 @@ const isInventorySelected = (inventory: InventorySelectRow) =>
 
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
-  refreshTotalAmount()
 }
 
 const handleSourceWarehouseChange = () => {
   formData.value.details = []
-  refreshTotalAmount()
 }
 const handleTargetWarehouseChange = () => {
   refreshTargetToDetails()
@@ -283,10 +295,40 @@ const refreshTargetToDetails = () => {
     detail.targetWarehouseId = formData.value.targetWarehouseId
   })
 }
-const refreshTotalAmount = () => {
-  formData.value.totalAmount = detailTotalAmount.value
+
+const handleDetailQuantityChange = (detail: MovementOrderDetailVO) => {
+  if (detail.price !== undefined && detail.price !== null) {
+    detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
+    return
+  }
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
+const handleDetailPriceChange = (detail: MovementOrderDetailVO) => {
+  detail.totalPrice = multiplyPrice(detail.quantity, detail.price)
+}
+
+const handleDetailTotalPriceChange = (detail: MovementOrderDetailVO) => {
+  detail.price = dividePrice(detail.totalPrice, detail.quantity)
+}
+
+const getDetailSummaries = ({ columns, data }: { columns: any[]; data: MovementOrderDetailVO[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'price') {
+      return formatPrice(detailPriceSum.value)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
+    }
+    return ''
+  })
+
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
   if (formData.value.sourceWarehouseId === formData.value.targetWarehouseId) {
@@ -315,13 +357,13 @@ const validateDetails = (required: boolean) => {
 }
 
 /** 构建提交数据 */
-const buildSubmitData = () =>
-  ({
-    ...formData.value,
-    totalQuantity: totalQuantity.value,
-    totalAmount: formData.value.totalAmount,
-    details: formData.value.details || []
-  }) as MovementOrderVO
+const buildSubmitData = () => {
+  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  return {
+    ...order,
+    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+  } as MovementOrderVO
+}
 
 const emit = defineEmits(['success'])
 const submitForm = async () => {
@@ -387,8 +429,6 @@ const resetForm = () => {
     status: OrderStatusEnum.PREPARE,
     sourceWarehouseId: undefined,
     targetWarehouseId: undefined,
-    totalQuantity: 0,
-    totalAmount: 0,
     remark: undefined,
     details: []
   }
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 927a67aa9..30de21b95 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -53,10 +53,10 @@
           />
         </div>
       </el-form-item>
-      <el-form-item label="总金额" prop="totalAmountMin">
+      <el-form-item label="总金额" prop="totalPriceMin">
         <div class="flex w-240px items-center gap-8px">
           <el-input-number
-            v-model="queryParams.totalAmountMin"
+            v-model="queryParams.totalPriceMin"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -65,7 +65,7 @@
           />
           <span>至</span>
           <el-input-number
-            v-model="queryParams.totalAmountMax"
+            v-model="queryParams.totalPriceMax"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -172,8 +172,11 @@
             <el-table-column align="right" label="移库数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
+            <el-table-column align="right" label="单价(元)" width="120">
+              <template #default="{ row: detail }">{{ formatPrice(detail.price) || '-' }}</template>
+            </el-table-column>
             <el-table-column align="right" label="金额(元)" width="120">
-              <template #default="{ row: detail }">{{ formatPrice(detail.amount) || '-' }}</template>
+              <template #default="{ row: detail }">{{ formatPrice(getDetailTotalPrice(detail)) || '-' }}</template>
             </el-table-column>
           </el-table>
         </template>
@@ -221,7 +224,7 @@
           </div>
           <div class="flex items-center justify-between">
             <span>金额：</span>
-            <span>{{ formatPrice(row.totalAmount) }}</span>
+            <span>{{ formatPrice(row.totalPrice) }}</span>
           </div>
         </template>
       </el-table-column>
@@ -331,8 +334,8 @@ const getDefaultQueryParams = () => ({
   orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
-  totalAmountMin: undefined as number | undefined,
-  totalAmountMax: undefined as number | undefined,
+  totalPriceMin: undefined as number | undefined,
+  totalPriceMax: undefined as number | undefined,
   creator: undefined as number | undefined,
   updater: undefined as number | undefined,
   createTime: undefined as string[] | undefined,
@@ -373,6 +376,12 @@ const resetQuery = () => {
   Object.assign(queryParams, getDefaultQueryParams())
   handleQuery()
 }
+const getDetailTotalPrice = (detail: MovementOrderDetailVO) => {
+  if (!detail.quantity || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return Number(detail.quantity) * Number(detail.price)
+}
 const handleExpandChange = async (row: MovementOrderVO) => {
   if (!row.id || detailMap[row.id]) return
   detailMap[row.id] = await MovementOrderApi.getMovementOrderDetailListByOrderId(row.id)

From 804ad667e0b55ba426d2e6b5228fc34675442268 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 17:03:49 +0800
Subject: [PATCH 26/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=98=E5=BA=93=E5=8D=95=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/order/check/detail/index.ts       |   3 +-
 src/api/wms/order/check/index.ts              |   3 +-
 src/utils/dict.ts                             |   2 +-
 .../inventory/components/InventorySelect.vue  |   2 +-
 src/views/wms/inventory/history/index.vue     |  16 +-
 .../wms/order/check/CheckOrderDetail.vue      |  72 ++++++-
 src/views/wms/order/check/CheckOrderForm.vue  | 175 ++++++++++++-----
 src/views/wms/order/check/CheckOrderPrint.vue | 184 ++++++++++++++++++
 src/views/wms/order/check/index.vue           | 108 ++++++++--
 src/views/wms/utils/format.ts                 |   8 +-
 10 files changed, 484 insertions(+), 89 deletions(-)
 create mode 100644 src/views/wms/order/check/CheckOrderPrint.vue

diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index 4009d7f5e..9424a3064 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -15,8 +15,7 @@ export interface CheckOrderDetailVO {
   receiptTime?: Date
   quantity?: number
   checkQuantity?: number
-  differenceQuantity?: number
   availableQuantity?: number
-  amount?: number
+  price?: number
   createTime?: Date
 }
diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts
index 3773c64ea..a28b298ef 100644
--- a/src/api/wms/order/check/index.ts
+++ b/src/api/wms/order/check/index.ts
@@ -11,7 +11,8 @@ export interface CheckOrderVO {
   warehouseId?: number
   warehouseName?: string
   totalQuantity?: number
-  totalAmount?: number
+  totalPrice?: number
+  actualPrice?: number
   details?: CheckOrderDetailVO[]
   createTime?: Date
   creator?: string
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index df5dbc00a..35774ab65 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -218,7 +218,7 @@ export enum DICT_TYPE {
 
   // ========== WMS - 仓库管理模块 ==========
   WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
-  WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型
+  WMS_ORDER_TYPE = 'wms_order_type', // WMS 单据类型
   WMS_ORDER_STATUS = 'wms_order_status', // WMS 单据状态
   WMS_RECEIPT_ORDER_TYPE = 'wms_receipt_order_type', // WMS 入库单类型
   WMS_SHIPMENT_ORDER_TYPE = 'wms_shipment_order_type', // WMS 出库单类型
diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
index 1ecfba9e9..457d55490 100644
--- a/src/views/wms/inventory/components/InventorySelect.vue
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -129,7 +129,7 @@ import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
 import { formatQuantity } from '@/views/wms/utils/format'
 
 export interface InventorySelectRow extends InventoryVO {
-  amount?: number
+  price?: number
   availableQuantity?: number
 }
 
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index 4d0aaf673..42a7d46e1 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -9,28 +9,28 @@
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item label="操作类型" prop="orderType">
+      <el-form-item label="单据类型" prop="orderType">
         <el-select
           v-model="queryParams.orderType"
           class="!w-240px"
           clearable
-          placeholder="请选择操作类型"
+          placeholder="请选择单据类型"
           @change="handleQuery"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_INVENTORY_HISTORY_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="操作单号" prop="orderNo">
+      <el-form-item label="单据号" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
           class="!w-240px"
           clearable
-          placeholder="请输入操作单号"
+          placeholder="请输入单据号"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -107,10 +107,10 @@
       :show-overflow-tooltip="true"
       border
     >
-      <el-table-column fixed="left" label="操作单号" prop="orderNo" width="180" />
-      <el-table-column align="center" fixed="left" label="操作类型" width="110">
+      <el-table-column fixed="left" label="单据号" prop="orderNo" width="180" />
+      <el-table-column align="center" fixed="left" label="单据类型" width="110">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.WMS_INVENTORY_HISTORY_TYPE" :value="scope.row.orderType" />
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_TYPE" :value="scope.row.orderType" />
         </template>
       </el-table-column>
       <el-table-column label="商品信息" min-width="220">
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index f0d6e52af..5bd29292e 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -18,10 +18,20 @@
           <span v-else>-</span>
         </el-descriptions-item>
         <el-descriptions-item label="盈亏数量">
-          {{ formatQuantity(detailData.totalQuantity) || '-' }}
+          <span :class="getLossClass(detailData.totalQuantity)">
+            {{ formatQuantity(detailData.totalQuantity) || '-' }}
+          </span>
         </el-descriptions-item>
         <el-descriptions-item label="总金额">
-          {{ formatPrice(detailData.totalAmount) || '-' }}
+          {{ formatPrice(detailData.totalPrice) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="实际金额">
+          {{ formatPrice(detailData.actualPrice) || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="实际盈亏金额">
+          <span :class="getLossClass(getOrderDifferencePrice(detailData))">
+            {{ formatPrice(getOrderDifferencePrice(detailData)) || '-' }}
+          </span>
         </el-descriptions-item>
         <el-descriptions-item label="创建时间">
           {{ formatNullableDate(detailData.createTime) }}
@@ -55,14 +65,26 @@
         <el-table-column align="right" label="账面数量" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
+        <el-table-column align="right" label="单价(元)" prop="price" width="120">
+          <template #default="{ row }">{{ formatPrice(row.price) || '-' }}</template>
+        </el-table-column>
         <el-table-column align="right" label="实盘数量" prop="checkQuantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.checkQuantity) || '-' }}</template>
         </el-table-column>
-        <el-table-column align="right" label="盈亏数量" prop="differenceQuantity" width="120">
-          <template #default="{ row }">{{ formatQuantity(row.differenceQuantity) || '-' }}</template>
+        <el-table-column align="right" label="实际金额(元)" prop="actualPrice" width="140">
+          <template #default="{ row }">{{ formatPrice(getActualPrice(row)) || '-' }}</template>
         </el-table-column>
-        <el-table-column align="right" label="金额(元)" prop="amount" width="140">
-          <template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
+        <el-table-column align="right" label="盈亏数量" prop="differenceQuantity" width="120">
+          <template #default="{ row }">
+            <span :class="getLossClass(getDifferenceQuantity(row))">
+              {{ formatQuantity(getDifferenceQuantity(row)) || '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="实际盈亏金额(元)" prop="differencePrice" width="160">
+          <template #default="{ row }">
+            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) || '-' }}</span>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -70,11 +92,21 @@
 </template>
 
 <script lang="ts" setup>
+import { h } from 'vue'
 import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity,
+  getLossClass,
+  roundPrice,
+  sumPrice,
+  sumQuantity
+} from '@/views/wms/utils/format'
 
 /** WMS 盘库单详情 */
 defineOptions({ name: 'WmsCheckOrderDetail' })
@@ -82,14 +114,36 @@ defineOptions({ name: 'WmsCheckOrderDetail' })
 const loading = ref(false)
 const dialogVisible = ref(false)
 const detailData = ref<CheckOrderVO>({})
+const getOrderDifferencePrice = (order: CheckOrderVO) =>
+  roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
+const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getActualPrice = (detail: CheckOrderDetailVO) => {
+  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
+}
+const getDifferencePrice = (detail: CheckOrderDetailVO) => {
+  if (detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
+}
+const renderLossText = (value: number | string | null | undefined, formatter: (value?: number | string | null) => string) =>
+  h('span', { class: getLossClass(value) }, formatter(value))
 
 const getSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderDetailVO[] }) =>
   columns.map((column, index) => {
     if (index === 0) return '合计'
     if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
     if (column.property === 'checkQuantity') return formatSumQuantity(data, (detail) => detail.checkQuantity)
-    if (column.property === 'differenceQuantity') return formatSumQuantity(data, (detail) => detail.differenceQuantity)
-    if (column.property === 'amount') return formatSumPrice(data, (detail) => detail.amount)
+    if (column.property === 'actualPrice') return formatSumPrice(data, (detail) => getActualPrice(detail))
+    if (column.property === 'differenceQuantity') {
+      return renderLossText(sumQuantity(data, (detail) => getDifferenceQuantity(detail)), formatQuantity)
+    }
+    if (column.property === 'differencePrice') {
+      return renderLossText(sumPrice(data, (detail) => getDifferencePrice(detail)), formatPrice)
+    }
     return ''
   })
 
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 60dd3d6d3..6297ab494 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -25,23 +25,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="盈亏数量" prop="totalQuantity">
-            <el-input :model-value="formatQuantity(totalQuantity)" disabled />
+          <el-form-item label="实际金额">
+            <el-input :model-value="formatPrice(actualPrice)" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="总金额" prop="totalAmount">
-            <el-input-number
-              v-model="formData.totalAmount"
-              :controls="false"
-              :min="0"
-              :precision="PRICE_PRECISION"
-              class="!w-1/1"
-              placeholder="请输入总金额"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
           </el-form-item>
@@ -59,7 +47,13 @@
           </span>
         </el-tooltip>
       </div>
-      <el-table :data="formData.details" border empty-text="暂无商品明细">
+      <el-table
+        :data="formData.details"
+        :summary-method="getDetailSummaries"
+        border
+        empty-text="暂无商品明细"
+        show-summary
+      >
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
@@ -72,10 +66,23 @@
             <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="right" label="账面数量" width="120">
+        <el-table-column align="right" label="账面库存" prop="quantity" width="120">
           <template #default="{ row }">{{ formatQuantity(row.quantity) || '-' }}</template>
         </el-table-column>
-        <el-table-column label="实盘数量" width="160">
+        <el-table-column label="单价(元)" prop="price" width="160">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.price"
+              :controls="false"
+              :min="0"
+              :precision="PRICE_PRECISION"
+              class="!w-1/1"
+              placeholder="单价"
+              @change="handleDetailPriceChange(row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="实际库存" prop="checkQuantity" width="160">
           <template #default="{ row }">
             <el-input-number
               v-model="row.checkQuantity"
@@ -84,25 +91,33 @@
               :precision="QUANTITY_PRECISION"
               class="!w-1/1"
               placeholder="数量"
+              @change="handleDetailCheckQuantityChange(row)"
             />
           </template>
         </el-table-column>
-        <el-table-column align="right" label="盈亏数量" width="120">
-          <template #default="{ row }">{{ formatQuantity(getDifferenceQuantity(row)) }}</template>
-        </el-table-column>
-        <el-table-column label="金额(元)" width="160">
+        <el-table-column label="实际金额(元)" prop="actualPrice" width="160">
           <template #default="{ row }">
             <el-input-number
-              v-model="row.amount"
+              v-model="row.actualPrice"
               :controls="false"
               :min="0"
               :precision="PRICE_PRECISION"
               class="!w-1/1"
               placeholder="金额"
-              @change="refreshTotalAmount"
+              @change="handleDetailActualPriceChange(row)"
             />
           </template>
         </el-table-column>
+        <el-table-column align="right" label="盈亏数" prop="differenceQuantity" width="120">
+          <template #default="{ row }">
+            <span :class="getLossClass(getDifferenceQuantity(row))">{{ formatQuantity(getDifferenceQuantity(row)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="实际盈亏金额(元)" prop="differencePrice" width="160">
+          <template #default="{ row }">
+            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="80">
           <template #default="{ $index }">
             <el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
@@ -148,12 +163,26 @@
 
 <script lang="ts" setup>
 import { FormRules } from 'element-plus'
+import { h } from 'vue'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice } from '@/views/wms/utils/format'
+import {
+  dividePrice,
+  getLossClass,
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity,
+  multiplyPrice,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION,
+  roundPrice,
+  sumPrice,
+  sumQuantity
+} from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
 /** WMS 盘库单表单 */
@@ -167,32 +196,42 @@ const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref('')
 const originalFormData = ref('')
-const formData = ref<CheckOrderVO>({
+
+type CheckOrderFormDetail = CheckOrderDetailVO & { actualPrice?: number }
+type CheckOrderFormData = Omit<CheckOrderVO, 'details'> & { details?: CheckOrderFormDetail[] }
+
+const formData = ref<CheckOrderFormData>({
   id: undefined,
   no: undefined,
   orderTime: undefined,
   status: OrderStatusEnum.PREPARE,
   warehouseId: undefined,
-  totalQuantity: 0,
-  totalAmount: 0,
   remark: undefined,
   details: []
 })
 const formRules = reactive<FormRules>({
   no: [{ required: true, message: '盘库单号不能为空', trigger: 'blur' }],
   orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
-  totalQuantity: [{ required: true, message: '盈亏数量不能为空', trigger: 'change' }],
-  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
 })
 const formRef = ref()
 const inventorySelectRef = ref()
 
-const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
-const totalQuantity = computed(() =>
-  (formData.value.details || []).reduce((sum, detail) => sum + getDifferenceQuantity(detail), 0)
-)
-const detailTotalAmount = computed(() => sumPrice(formData.value.details || [], (detail) => detail.amount))
+const getDifferenceQuantity = (detail: CheckOrderFormDetail) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getBookPrice = (detail: CheckOrderFormDetail) => multiplyPrice(detail.quantity, detail.price)
+const getActualPrice = (detail: CheckOrderFormDetail) => detail.actualPrice ?? multiplyPrice(detail.checkQuantity, detail.price)
+const getDifferencePrice = (detail: CheckOrderFormDetail) => {
+  if (detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
+}
+const renderLossText = (value: number | string | null | undefined, formatter: (value?: number | string | null) => string) =>
+  h('span', { class: getLossClass(value) }, formatter(value))
+const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => getDifferenceQuantity(detail)))
+const totalPrice = computed(() => sumPrice(formData.value.details || [], (detail) => getBookPrice(detail)))
+const actualPrice = computed(() => sumPrice(formData.value.details || [], (detail) => getActualPrice(detail)))
+const differencePrice = computed(() => roundPrice(actualPrice.value - totalPrice.value) || 0)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -215,7 +254,7 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       const order = await CheckOrderApi.getCheckOrder(id)
-      formData.value = { ...order, details: order.details || [] }
+      formData.value = { ...order, details: normalizeDetails(order.details || []) }
     } finally {
       formLoading.value = false
     }
@@ -225,7 +264,7 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open })
 
 /** 构建盘库明细 */
-const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
+const buildDetail = (inventory: InventorySelectRow): CheckOrderFormDetail => ({
   id: undefined,
   itemId: inventory.itemId,
   itemCode: inventory.itemCode,
@@ -240,9 +279,16 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
   quantity: inventory.availableQuantity,
   checkQuantity: inventory.availableQuantity,
   availableQuantity: inventory.availableQuantity,
-  amount: inventory.amount
+  price: inventory.price,
+  actualPrice: multiplyPrice(inventory.availableQuantity, inventory.price)
 })
 
+const normalizeDetails = (details: CheckOrderDetailVO[]) =>
+  details.map((detail) => ({
+    ...detail,
+    actualPrice: multiplyPrice(detail.checkQuantity, detail.price)
+  }))
+
 const handleAddDetail = () => inventorySelectRef.value?.open()
 const handleSelectInventory = (inventories: InventorySelectRow[]) => {
   if (!inventories.length) return
@@ -251,7 +297,6 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
     if (isInventorySelected(inventory)) return
     formData.value.details!.push(buildDetail(inventory))
   })
-  refreshTotalAmount()
 }
 const isInventorySelected = (inventory: InventorySelectRow) =>
   (formData.value.details || []).some((detail) => {
@@ -259,16 +304,38 @@ const isInventorySelected = (inventory: InventorySelectRow) =>
   })
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
-  refreshTotalAmount()
 }
 const handleWarehouseChange = () => {
   formData.value.details = []
-  refreshTotalAmount()
 }
-const refreshTotalAmount = () => {
-  formData.value.totalAmount = detailTotalAmount.value
+
+const handleDetailCheckQuantityChange = (detail: CheckOrderFormDetail) => {
+  if (detail.price !== undefined && detail.price !== null) {
+    detail.actualPrice = multiplyPrice(detail.checkQuantity, detail.price)
+    return
+  }
+  detail.price = dividePrice(detail.actualPrice, detail.checkQuantity)
 }
 
+const handleDetailPriceChange = (detail: CheckOrderFormDetail) => {
+  detail.actualPrice = multiplyPrice(detail.checkQuantity, detail.price)
+}
+
+const handleDetailActualPriceChange = (detail: CheckOrderFormDetail) => {
+  detail.price = dividePrice(detail.actualPrice, detail.checkQuantity)
+}
+
+const getDetailSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderFormDetail[] }) =>
+  columns.map((column, index) => {
+    if (index === 0) return '合计'
+    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
+    if (column.property === 'checkQuantity') return formatSumQuantity(data, (detail) => detail.checkQuantity)
+    if (column.property === 'actualPrice') return formatSumPrice(data, (detail) => getActualPrice(detail))
+    if (column.property === 'differenceQuantity') return renderLossText(totalQuantity.value, formatQuantity)
+    if (column.property === 'differencePrice') return renderLossText(differencePrice.value, formatPrice)
+    return ''
+  })
+
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
   if (!formData.value.details?.length) {
@@ -289,13 +356,17 @@ const validateDetails = (required: boolean) => {
 }
 
 /** 构建提交数据 */
-const buildSubmitData = () =>
-  ({
-    ...formData.value,
-    totalQuantity: totalQuantity.value,
-    totalAmount: formData.value.totalAmount,
-    details: formData.value.details || []
-  }) as CheckOrderVO
+const buildSubmitData = () => {
+  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, actualPrice: _actualPrice, details, ...order } = formData.value
+  return {
+    ...order,
+    details: (details || []).map(({
+      actualPrice: _rowActualPrice,
+      availableQuantity: _availableQuantity,
+      ...detail
+    }) => detail)
+  } as CheckOrderVO
+}
 
 const emit = defineEmits(['success'])
 const submitForm = async () => {
@@ -360,8 +431,6 @@ const resetForm = () => {
     orderTime: undefined,
     status: OrderStatusEnum.PREPARE,
     warehouseId: undefined,
-    totalQuantity: 0,
-    totalAmount: 0,
     remark: undefined,
     details: []
   }
diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
new file mode 100644
index 000000000..c3b408eab
--- /dev/null
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -0,0 +1,184 @@
+<!-- WMS 盘库单打印 -->
+<template>
+  <div class="hidden">
+    <button ref="printButtonRef" v-print="printObj" type="button"></button>
+    <div id="wmsCheckOrderPrint" class="color-#303133">
+      <h2 class="text-center">盘库单</h2>
+      <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
+        <div>盘库单号：{{ printData.no || '-' }}</div>
+        <div>仓库：{{ printData.warehouseName || '-' }}</div>
+        <div>盘库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
+        <div>
+          盈亏数量：<span :class="getLossClass(printData.totalQuantity)">
+            {{ formatQuantity(printData.totalQuantity) || '-' }}
+          </span>
+        </div>
+        <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
+        <div>实际金额：{{ formatPrice(printData.actualPrice) || '-' }}</div>
+        <div>
+          实际盈亏金额：<span :class="getLossClass(getOrderDifferencePrice(printData))">
+            {{ formatPrice(getOrderDifferencePrice(printData)) || '-' }}
+          </span>
+        </div>
+        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
+        <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
+      </div>
+      <table class="w-full border-collapse text-13px">
+        <thead>
+          <tr>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">账面库存</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际库存</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际金额(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">盈亏数</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际盈亏金额(元)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="detail in printRows" :key="detail.id">
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.itemName || '-' }}</div>
+              <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.skuName || '-' }}</div>
+              <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatQuantity(detail.quantity) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.price) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatQuantity(detail.checkQuantity) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.actualPrice) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              <span :class="getLossClass(detail.differenceQuantity)">
+                {{ formatQuantity(detail.differenceQuantity) || '-' }}
+              </span>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              <span :class="getLossClass(detail.differencePrice)">
+                {{ formatPrice(detail.differencePrice) || '-' }}
+              </span>
+            </td>
+          </tr>
+          <tr v-if="printRows.length">
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px" colspan="2">合计</td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.price) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumQuantity(printRows, (detail) => detail.checkQuantity) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.actualPrice) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              <span :class="getLossClass(totalDifferenceQuantity)">
+                {{ formatQuantity(totalDifferenceQuantity) }}
+              </span>
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              <span :class="getLossClass(totalDifferencePrice)">
+                {{ formatPrice(totalDifferencePrice) }}
+              </span>
+            </td>
+          </tr>
+          <tr v-if="!printRows.length">
+            <td
+              class="border border-solid border-#dcdfe6 p-8px text-center"
+              :colspan="tableColumnCount"
+            >
+              暂无明细
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
+import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity,
+  getLossClass,
+  roundPrice,
+  sumPrice,
+  sumQuantity
+} from '@/views/wms/utils/format'
+
+/** WMS 盘库单打印 */
+defineOptions({ name: 'WmsCheckOrderPrint' })
+
+const printData = ref<CheckOrderVO>({}) // 打印数据
+const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
+const tableColumnCount = 8
+const printObj = ref({
+  id: 'wmsCheckOrderPrint',
+  popTitle: '&nbsp',
+  extraCss: '/print.css',
+  extraHead: '',
+  zIndex: 20003
+})
+
+interface PrintRow extends CheckOrderDetailVO {
+  actualPrice?: number
+  differenceQuantity?: number
+  differencePrice?: number
+}
+
+const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getActualPrice = (detail: CheckOrderDetailVO) => {
+  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
+}
+const getDifferencePrice = (detail: CheckOrderDetailVO, differenceQuantity: number) => {
+  if (detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(differenceQuantity * Number(detail.price))
+}
+const getOrderDifferencePrice = (order: CheckOrderVO) =>
+  roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
+const printRows = computed<PrintRow[]>(() =>
+  (printData.value.details || []).map((detail) => {
+    const differenceQuantity = getDifferenceQuantity(detail)
+    return {
+      ...detail,
+      actualPrice: getActualPrice(detail),
+      differenceQuantity,
+      differencePrice: getDifferencePrice(detail, differenceQuantity)
+    }
+  })
+)
+const totalDifferenceQuantity = computed(() => sumQuantity(printRows.value, (detail) => detail.differenceQuantity))
+const totalDifferencePrice = computed(() => sumPrice(printRows.value, (detail) => detail.differencePrice))
+
+/** 打印盘库单 */
+const print = async (id: number) => {
+  printData.value = await CheckOrderApi.getCheckOrder(id)
+  await nextTick()
+  printButtonRef.value?.click()
+}
+defineExpose({ print })
+</script>
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 7513d06c1..f22b6474e 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -48,10 +48,10 @@
           />
         </div>
       </el-form-item>
-      <el-form-item label="总金额" prop="totalAmountMin">
+      <el-form-item label="总金额" prop="totalPriceMin">
         <div class="flex w-240px items-center gap-8px">
           <el-input-number
-            v-model="queryParams.totalAmountMin"
+            v-model="queryParams.totalPriceMin"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -60,7 +60,28 @@
           />
           <span>至</span>
           <el-input-number
-            v-model="queryParams.totalAmountMax"
+            v-model="queryParams.totalPriceMax"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最大值"
+          />
+        </div>
+      </el-form-item>
+      <el-form-item label="实际金额" prop="actualPriceMin">
+        <div class="flex w-240px items-center gap-8px">
+          <el-input-number
+            v-model="queryParams.actualPriceMin"
+            :controls="false"
+            :min="0"
+            :precision="PRICE_PRECISION"
+            class="!w-105px"
+            placeholder="最小值"
+          />
+          <span>至</span>
+          <el-input-number
+            v-model="queryParams.actualPriceMax"
             :controls="false"
             :min="0"
             :precision="PRICE_PRECISION"
@@ -170,8 +191,25 @@
             <el-table-column align="right" label="实盘数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.checkQuantity) }}</template>
             </el-table-column>
+            <el-table-column align="right" label="单价(元)" width="120">
+              <template #default="{ row: detail }">{{ formatPrice(detail.price) }}</template>
+            </el-table-column>
+            <el-table-column align="right" label="实际金额(元)" width="140">
+              <template #default="{ row: detail }">{{ formatPrice(getDetailActualPrice(detail)) }}</template>
+            </el-table-column>
             <el-table-column align="right" label="盈亏数量" width="120">
-              <template #default="{ row: detail }">{{ formatQuantity(detail.differenceQuantity) }}</template>
+              <template #default="{ row: detail }">
+                <span :class="getLossClass(getDetailDifferenceQuantity(detail))">
+                  {{ formatQuantity(getDetailDifferenceQuantity(detail)) }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="实际盈亏金额(元)" width="160">
+              <template #default="{ row: detail }">
+                <span :class="getLossClass(getDetailDifferencePrice(detail))">
+                  {{ formatPrice(getDetailDifferencePrice(detail)) }}
+                </span>
+              </template>
             </el-table-column>
           </el-table>
         </template>
@@ -202,15 +240,23 @@
           {{ row.warehouseName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="盈亏数量/总金额(元)" min-width="180">
+      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="盈亏/金额(元)" min-width="200">
         <template #default="{ row }">
           <div class="flex items-center justify-between">
-            <span>盈亏：</span>
-            <span>{{ formatQuantity(row.totalQuantity) }}</span>
+            <span>盈亏数：</span>
+            <span :class="getLossClass(row.totalQuantity)">{{ formatQuantity(row.totalQuantity) }}</span>
           </div>
           <div class="flex items-center justify-between">
-            <span>金额：</span>
-            <span>{{ formatPrice(row.totalAmount) }}</span>
+            <span>总金额：</span>
+            <span>{{ formatPrice(row.totalPrice) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>实际金额：</span>
+            <span>{{ formatPrice(row.actualPrice) }}</span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span>盈亏金额：</span>
+            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) }}</span>
           </div>
         </template>
       </el-table-column>
@@ -249,6 +295,14 @@
               </el-button>
             </span>
           </el-tooltip>
+          <el-button
+            v-hasPermi="['wms:check-order:query']"
+            link
+            type="primary"
+            @click="handlePrint(row.id)"
+          >
+            打印
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -257,6 +311,7 @@
 
   <CheckOrderForm ref="formRef" @success="getList" />
   <CheckOrderDetail ref="detailRef" />
+  <CheckOrderPrint ref="printRef" />
 </template>
 
 <script lang="ts" setup>
@@ -266,10 +321,18 @@ import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  getLossClass,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION,
+  roundPrice
+} from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import CheckOrderDetail from './CheckOrderDetail.vue'
 import CheckOrderForm from './CheckOrderForm.vue'
+import CheckOrderPrint from './CheckOrderPrint.vue'
 import download from '@/utils/download'
 
 /** WMS 盘库单 */
@@ -284,7 +347,7 @@ const tableColumnOptions: Array<{ label: string; value: TableColumnKey }> = [
   { label: '单号', value: 'no' },
   { label: '盘库状态', value: 'status' },
   { label: '仓库', value: 'warehouse' },
-  { label: '盈亏/金额(元)', value: 'quantityAmount' },
+  { label: '盈亏/金额', value: 'quantityAmount' },
   { label: '操作信息', value: 'operateInfo' },
   { label: '备注', value: 'remark' }
 ]
@@ -310,8 +373,10 @@ const getDefaultQueryParams = () => ({
   orderTime: undefined as string[] | undefined,
   totalQuantityMin: undefined as number | undefined,
   totalQuantityMax: undefined as number | undefined,
-  totalAmountMin: undefined as number | undefined,
-  totalAmountMax: undefined as number | undefined,
+  totalPriceMin: undefined as number | undefined,
+  totalPriceMax: undefined as number | undefined,
+  actualPriceMin: undefined as number | undefined,
+  actualPriceMax: undefined as number | undefined,
   creator: undefined as number | undefined,
   updater: undefined as number | undefined,
   createTime: undefined as string[] | undefined,
@@ -333,6 +398,21 @@ const getDeleteTip = (status?: number) => {
   if (status === OrderStatusEnum.FINISHED) return '已盘库，无法删除'
   return '当前状态无法删除'
 }
+const getDifferencePrice = (row: CheckOrderVO) => roundPrice(Number(row.actualPrice || 0) - Number(row.totalPrice || 0))
+const getDetailDifferenceQuantity = (detail: CheckOrderDetailVO) =>
+  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getDetailActualPrice = (detail: CheckOrderDetailVO) => {
+  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
+}
+const getDetailDifferencePrice = (detail: CheckOrderDetailVO) => {
+  if (detail.price === undefined || detail.price === null) {
+    return undefined
+  }
+  return roundPrice(getDetailDifferenceQuantity(detail) * Number(detail.price))
+}
 
 const getList = async () => {
   loading.value = true
@@ -361,6 +441,8 @@ const formRef = ref()
 const openForm = (type: string, id?: number) => formRef.value.open(type, id)
 const detailRef = ref()
 const openDetail = (id: number) => detailRef.value.open(id)
+const printRef = ref()
+const handlePrint = (id: number) => printRef.value.print(id)
 
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/wms/utils/format.ts b/src/views/wms/utils/format.ts
index b5dd5d780..f6a84575b 100644
--- a/src/views/wms/utils/format.ts
+++ b/src/views/wms/utils/format.ts
@@ -53,9 +53,15 @@ export const roundPrice = (value: number) => {
   return Number.isFinite(value) ? Number(value.toFixed(PRICE_PRECISION)) : undefined
 }
 
+/** 亏损数字样式 */
+export const getLossClass = (value?: number | string | null) => {
+  const decimalValue = toFiniteDecimal(value)
+  return decimalValue !== undefined && decimalValue < 0 ? 'text-red-500' : ''
+}
+
 /** 数量 * 单价，计算金额 */
 export const multiplyPrice = (quantity?: number, price?: number) => {
-  if (!quantity || price === undefined || price === null) {
+  if (quantity === undefined || quantity === null || price === undefined || price === null) {
     return undefined
   }
   return roundPrice(Number(quantity) * Number(price))

From 58537a34c72ba0f51b82a5071b5e6a6a83904bc1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 18:53:56 +0800
Subject: [PATCH 27/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5=E7=9A=84=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/home/index.ts    |  77 ++++
 src/views/wms/home/index.vue | 690 +++++++++++++++++++++++++++++++++++
 2 files changed, 767 insertions(+)
 create mode 100644 src/api/wms/home/index.ts
 create mode 100644 src/views/wms/home/index.vue

diff --git a/src/api/wms/home/index.ts b/src/api/wms/home/index.ts
new file mode 100644
index 000000000..68cf18c5f
--- /dev/null
+++ b/src/api/wms/home/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+// WMS 首页统计查询参数
+export interface WmsHomeStatisticsReqVO {
+  warehouseId?: number
+}
+
+// WMS 首页单据状态统计 VO
+export interface WmsHomeOrderStatusVO {
+  status: number
+  statusName: string
+  count: number
+}
+
+// WMS 首页单据汇总统计 VO
+export interface WmsHomeOrderSummaryVO {
+  orderType: number
+  orderTypeName: string
+  total: number
+  statusList: WmsHomeOrderStatusVO[]
+}
+
+// WMS 首页单据趋势 VO
+export interface WmsHomeOrderTrendVO {
+  date: string
+  receiptCount: number
+  shipmentCount: number
+  movementCount: number
+  checkCount: number
+}
+
+// WMS 首页商品库存排行 VO
+export interface WmsHomeInventoryItemRankVO {
+  itemId: number
+  itemName: string
+  quantity: number
+}
+
+// WMS 首页仓库库存排行 VO
+export interface WmsHomeInventoryWarehouseRankVO {
+  warehouseId: number
+  warehouseName: string
+  quantity: number
+}
+
+// WMS 首页库存汇总统计 VO
+export interface WmsHomeInventorySummaryVO {
+  totalQuantity: number
+  goodsShareList: WmsHomeInventoryItemRankVO[]
+  warehouseDistributionList: WmsHomeInventoryWarehouseRankVO[]
+}
+
+// WMS 首页统计 API
+export const WmsHomeStatisticsApi = {
+  // 获得首页单据汇总统计
+  getOrderSummary: async (params?: WmsHomeStatisticsReqVO): Promise<WmsHomeOrderSummaryVO[]> => {
+    return await request.get({ url: `/wms/home-statistics/order-summary`, params })
+  },
+
+  // 获得首页单据趋势
+  getOrderTrend: async (
+    days?: number,
+    params?: WmsHomeStatisticsReqVO
+  ): Promise<WmsHomeOrderTrendVO[]> => {
+    return await request.get({
+      url: `/wms/home-statistics/order-trend`,
+      params: { ...params, days }
+    })
+  },
+
+  // 获得首页库存汇总统计
+  getInventorySummary: async (
+    params?: WmsHomeStatisticsReqVO
+  ): Promise<WmsHomeInventorySummaryVO> => {
+    return await request.get({ url: `/wms/home-statistics/inventory-summary`, params })
+  }
+}
diff --git a/src/views/wms/home/index.vue b/src/views/wms/home/index.vue
new file mode 100644
index 000000000..20f1fc0b1
--- /dev/null
+++ b/src/views/wms/home/index.vue
@@ -0,0 +1,690 @@
+<!-- TODO @AI：组件拆分下。 -->
+<template>
+  <div class="wms-home">
+    <div class="wms-home__toolbar">
+      <div class="wms-home__toolbar-main">
+        <div>
+          <div class="wms-home__title">WMS 首页</div>
+          <div class="wms-home__subtitle">单据工作台 / 库存概览</div>
+        </div>
+        <div class="wms-home__filters">
+          <el-select
+            v-model="warehouseId"
+            class="!w-220px"
+            clearable
+            filterable
+            placeholder="全部仓库"
+            @change="refresh"
+          >
+            <el-option
+              v-for="warehouse in warehouseList"
+              :key="warehouse.id!"
+              :label="warehouse.name"
+              :value="warehouse.id!"
+            />
+          </el-select>
+          <el-button :loading="loading || trendLoading || inventoryLoading" @click="refresh">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            刷新
+          </el-button>
+        </div>
+      </div>
+    </div>
+
+    <el-skeleton :loading="loading" animated>
+      <template #template>
+        <div class="wms-home__summary-grid">
+          <el-skeleton-item v-for="item in 4" :key="item" class="wms-home__summary-skeleton" />
+        </div>
+      </template>
+      <div class="wms-home__summary-grid">
+        <div
+          v-for="item in orderSummaries"
+          :key="item.key"
+          class="wms-home__summary-card"
+          :style="{ '--theme-color': item.color }"
+        >
+          <div class="wms-home__summary-head">
+            <div class="wms-home__summary-title">
+              <span :style="{ backgroundColor: item.color }"></span>
+              {{ item.title }}
+            </div>
+            <el-button link type="primary" @click="handleNavigate(item.routeName)">查看</el-button>
+          </div>
+          <div class="wms-home__summary-total">
+            <em>合计</em>
+            <span>{{ formatCount(item.total) }}</span>
+            <em>单</em>
+          </div>
+          <div class="wms-home__status-bar">
+            <span
+              v-for="status in statusList"
+              :key="status.key"
+              :style="{
+                width: getStatusPercent(item, status.key),
+                backgroundColor: status.color
+              }"
+            ></span>
+          </div>
+          <div class="wms-home__status-list">
+            <div v-for="status in statusList" :key="status.key">
+              <span>{{ status.label }}</span>
+              <strong :style="{ color: status.color }">{{ item.statusCounts[status.key] }}</strong>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-skeleton>
+
+    <div class="wms-home__chart-card">
+      <div class="wms-home__card-head">
+        <div>
+          <div class="wms-home__card-title">单据趋势</div>
+          <div class="wms-home__card-subtitle">入库、出库、移库、盘库单据数量</div>
+        </div>
+        <el-segmented v-model="trendDays" :options="trendDayOptions" @change="loadTrendData" />
+      </div>
+      <el-skeleton :loading="trendLoading" animated>
+        <Echart :height="330" :options="trendChartOptions" />
+      </el-skeleton>
+    </div>
+
+    <el-row :gutter="16">
+      <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
+        <div class="wms-home__chart-card">
+          <div class="wms-home__card-head">
+            <div>
+              <div class="wms-home__card-title">货物占比</div>
+              <div class="wms-home__card-subtitle">按商品库存数量汇总 Top 5</div>
+            </div>
+          </div>
+          <el-skeleton :loading="inventoryLoading" animated>
+            <Echart :height="300" :options="goodsShareChartOptions" />
+          </el-skeleton>
+        </div>
+      </el-col>
+      <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
+        <div class="wms-home__chart-card">
+          <div class="wms-home__card-head">
+            <div>
+              <div class="wms-home__card-title">库存分布</div>
+              <div class="wms-home__card-subtitle">按仓库库存数量汇总</div>
+            </div>
+            <div class="wms-home__total-quantity"
+              >总库存 {{ formatQuantityText(totalQuantity) }}</div
+            >
+          </div>
+          <el-skeleton :loading="inventoryLoading" animated>
+            <Echart :height="300" :options="inventoryDistributionChartOptions" />
+          </el-skeleton>
+        </div>
+      </el-col>
+    </el-row>
+
+    <div class="wms-home__stat-time">
+      <Icon class="mr-5px" icon="ep:clock" />
+      统计时间：{{ statTime }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { EChartsOption } from 'echarts'
+import { useRouter } from 'vue-router'
+import { WmsHomeOrderTrendVO, WmsHomeStatisticsApi, WmsHomeStatisticsReqVO } from '@/api/wms/home'
+import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
+import { OrderStatusEnum } from '@/views/wms/utils/constants'
+import { formatQuantity } from '@/views/wms/utils/format'
+import { formatDate } from '@/utils/formatTime'
+
+/** WMS 首页 */
+defineOptions({ name: 'WmsHome' })
+
+type StatusKey = 'prepare' | 'finished' | 'canceled'
+type OrderKey = 'receipt' | 'shipment' | 'movement' | 'check'
+
+interface OrderDefinition {
+  key: OrderKey
+  orderType: number
+  title: string
+  color: string
+  routeName: string
+  trendField: keyof Pick<
+    WmsHomeOrderTrendVO,
+    'receiptCount' | 'shipmentCount' | 'movementCount' | 'checkCount'
+  >
+}
+
+interface OrderSummary extends OrderDefinition {
+  total: number
+  statusCounts: Record<StatusKey, number>
+}
+
+interface ChartItem {
+  name: string
+  value: number
+}
+
+const router = useRouter()
+const message = useMessage()
+
+const statusList: Array<{ key: StatusKey; label: string; value: number; color: string }> = [
+  { key: 'prepare', label: '草稿', value: OrderStatusEnum.PREPARE, color: '#409eff' },
+  { key: 'finished', label: '已完成', value: OrderStatusEnum.FINISHED, color: '#67c23a' },
+  { key: 'canceled', label: '已作废', value: OrderStatusEnum.CANCELED, color: '#909399' }
+]
+
+const OrderTypeEnum = {
+  RECEIPT: 1,
+  SHIPMENT: 2,
+  MOVEMENT: 3,
+  CHECK: 4
+} as const
+
+const orderDefinitions: OrderDefinition[] = [
+  {
+    key: 'receipt',
+    orderType: OrderTypeEnum.RECEIPT,
+    title: '入库',
+    color: '#2f7df6',
+    routeName: 'WmsReceiptOrder',
+    trendField: 'receiptCount'
+  },
+  {
+    key: 'shipment',
+    orderType: OrderTypeEnum.SHIPMENT,
+    title: '出库',
+    color: '#18a058',
+    routeName: 'WmsShipmentOrder',
+    trendField: 'shipmentCount'
+  },
+  {
+    key: 'movement',
+    orderType: OrderTypeEnum.MOVEMENT,
+    title: '移库',
+    color: '#f59e0b',
+    routeName: 'WmsMovementOrder',
+    trendField: 'movementCount'
+  },
+  {
+    key: 'check',
+    orderType: OrderTypeEnum.CHECK,
+    title: '盘库',
+    color: '#7c3aed',
+    routeName: 'WmsCheckOrder',
+    trendField: 'checkCount'
+  }
+]
+
+const trendDayOptions = [
+  { label: '近7天', value: 7 },
+  { label: '近30天', value: 30 }
+]
+
+const loading = ref(false)
+const trendLoading = ref(false)
+const inventoryLoading = ref(false)
+const warehouseId = ref<number>()
+const warehouseList = ref<WarehouseVO[]>([])
+const statTime = ref(formatDate(new Date()))
+const orderSummaries = ref<OrderSummary[]>(
+  orderDefinitions.map((item) => ({
+    ...item,
+    total: 0,
+    statusCounts: { prepare: 0, finished: 0, canceled: 0 }
+  }))
+)
+const trendDays = ref(7)
+const trendLabels = ref<string[]>([])
+const trendSeriesMap = reactive<Record<OrderKey, number[]>>({
+  receipt: [],
+  shipment: [],
+  movement: [],
+  check: []
+})
+const totalQuantity = ref(0)
+const goodsShareList = ref<ChartItem[]>([])
+const inventoryDistributionList = ref<ChartItem[]>([])
+
+const getStatisticsParams = (): WmsHomeStatisticsReqVO => {
+  return warehouseId.value ? { warehouseId: warehouseId.value } : {}
+}
+
+const loadOrderSummaries = async () => {
+  const data = await WmsHomeStatisticsApi.getOrderSummary(getStatisticsParams())
+  orderSummaries.value = orderDefinitions.map((definition) => {
+    const summary = data.find((item) => item.orderType === definition.orderType)
+    const statusCounts = statusList.reduce(
+      (result, status) => {
+        const statusItem = summary?.statusList?.find((item) => item.status === status.value)
+        result[status.key] = statusItem?.count || 0
+        return result
+      },
+      { prepare: 0, finished: 0, canceled: 0 } as Record<StatusKey, number>
+    )
+    return {
+      ...definition,
+      total: summary?.total || 0,
+      statusCounts
+    }
+  })
+}
+
+const buildChartItemList = <T,>(
+  list: T[] | undefined,
+  nameGetter: (item: T) => string,
+  valueGetter: (item: T) => number | undefined
+) => {
+  return (list || [])
+    .map((item) => ({
+      name: nameGetter(item),
+      value: Number(valueGetter(item) || 0)
+    }))
+    .filter((item) => item.value > 0)
+}
+
+const loadTrendData = async () => {
+  trendLoading.value = true
+  try {
+    const data = await WmsHomeStatisticsApi.getOrderTrend(trendDays.value, getStatisticsParams())
+    trendLabels.value = data.map((item) => item.date.substring(5))
+    orderDefinitions.forEach((definition) => {
+      trendSeriesMap[definition.key] = data.map((item) => Number(item[definition.trendField] || 0))
+    })
+  } finally {
+    trendLoading.value = false
+  }
+}
+
+const loadInventoryData = async () => {
+  inventoryLoading.value = true
+  try {
+    const data = await WmsHomeStatisticsApi.getInventorySummary(getStatisticsParams())
+    totalQuantity.value = Number(data.totalQuantity || 0)
+    goodsShareList.value = buildChartItemList(
+      data.goodsShareList,
+      (item) => item.itemName || '未命名商品',
+      (item) => item.quantity
+    )
+    inventoryDistributionList.value = buildChartItemList(
+      data.warehouseDistributionList,
+      (item) => item.warehouseName || '未指定仓库',
+      (item) => item.quantity
+    )
+  } finally {
+    inventoryLoading.value = false
+  }
+}
+
+const refresh = async () => {
+  loading.value = true
+  try {
+    await Promise.all([loadOrderSummaries(), loadTrendData(), loadInventoryData()])
+    statTime.value = formatDate(new Date())
+  } finally {
+    loading.value = false
+  }
+}
+
+const loadWarehouseList = async () => {
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+}
+
+const handleNavigate = async (name: string) => {
+  try {
+    await router.push({ name })
+  } catch {
+    message.warning('当前菜单尚未加载，请从左侧菜单进入对应页面')
+  }
+}
+
+const getStatusPercent = (item: OrderSummary, key: StatusKey) => {
+  if (!item.total) {
+    return `${100 / statusList.length}%`
+  }
+  return `${Math.max((item.statusCounts[key] / item.total) * 100, 4)}%`
+}
+
+const formatCount = (value: number) => value.toLocaleString()
+const formatQuantityText = (value: number) => formatQuantity(value) || '0.00'
+const chartFontFamily =
+  "Inter, 'Helvetica Neue', Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif"
+const chartTextStyle = {
+  color: '#303133',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  fontWeight: 400,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+const chartAxisLabelStyle = {
+  color: '#8a9099',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+
+const formatGoodsLegend = (name: string) => {
+  const total = goodsShareList.value.reduce((sum, item) => sum + item.value, 0)
+  const item = goodsShareList.value.find((goods) => goods.name === name)
+  if (!total || !item) {
+    return name
+  }
+  return `${name}  ${((item.value / total) * 100).toFixed(1)}%`
+}
+
+const trendChartOptions = computed<EChartsOption>(() => ({
+  color: orderDefinitions.map((item) => item.color),
+  grid: { top: 48, left: 28, right: 24, bottom: 24, containLabel: true },
+  textStyle: chartTextStyle,
+  legend: { top: 6, itemWidth: 10, itemHeight: 10, textStyle: chartTextStyle },
+  tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+  xAxis: {
+    type: 'category',
+    data: trendLabels.value,
+    axisLabel: chartAxisLabelStyle,
+    axisTick: { show: false },
+    axisLine: { lineStyle: { color: '#dcdfe6' } }
+  },
+  yAxis: {
+    type: 'value',
+    name: '单据数',
+    nameTextStyle: chartAxisLabelStyle,
+    axisLabel: chartAxisLabelStyle,
+    minInterval: 1,
+    splitLine: { lineStyle: { color: '#eef2f7' } }
+  },
+  series: orderDefinitions.map((item) => ({
+    name: item.title,
+    type: 'bar',
+    barMaxWidth: 18,
+    data: trendSeriesMap[item.key],
+    emphasis: { focus: 'series' }
+  }))
+}))
+
+const goodsShareChartOptions = computed<EChartsOption>(() => ({
+  color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'],
+  textStyle: chartTextStyle,
+  tooltip: {
+    trigger: 'item',
+    formatter: '{b}<br/>库存：{c} ({d}%)'
+  },
+  legend: {
+    type: 'scroll',
+    orient: 'vertical',
+    right: 10,
+    top: 'middle',
+    itemWidth: 10,
+    itemHeight: 10,
+    formatter: formatGoodsLegend,
+    textStyle: chartTextStyle
+  },
+  series: [
+    {
+      name: '货物占比',
+      type: 'pie',
+      radius: ['48%', '70%'],
+      center: ['34%', '52%'],
+      avoidLabelOverlap: true,
+      label: { show: false },
+      labelLine: { show: false },
+      data: goodsShareList.value
+    }
+  ]
+}))
+
+const inventoryDistributionChartOptions = computed<EChartsOption>(() => ({
+  color: ['#2f7df6'],
+  grid: { top: 12, left: 24, right: 40, bottom: 16, containLabel: true },
+  textStyle: chartTextStyle,
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'shadow' },
+    formatter: (params: any) => {
+      const item = Array.isArray(params) ? params[0] : params
+      return `${item.name}<br/>库存：${formatQuantityText(item.value)}`
+    }
+  },
+  xAxis: {
+    type: 'value',
+    axisLabel: chartAxisLabelStyle,
+    splitLine: { lineStyle: { color: '#eef2f7' } }
+  },
+  yAxis: {
+    type: 'category',
+    data: inventoryDistributionList.value.map((item) => item.name).reverse(),
+    axisLabel: chartAxisLabelStyle,
+    axisTick: { show: false },
+    axisLine: { show: false }
+  },
+  series: [
+    {
+      name: '库存',
+      type: 'bar',
+      barMaxWidth: 16,
+      data: inventoryDistributionList.value.map((item) => item.value).reverse(),
+      label: {
+        show: true,
+        position: 'right',
+        ...chartTextStyle,
+        formatter: ({ value }) => formatQuantityText(Number(value))
+      }
+    }
+  ]
+}))
+
+onMounted(async () => {
+  loading.value = true
+  try {
+    await loadWarehouseList()
+    await refresh()
+  } finally {
+    loading.value = false
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.wms-home {
+  --wms-card-radius: 8px;
+}
+
+.wms-home__toolbar {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  justify-content: space-between;
+  margin-bottom: 16px;
+  padding: 16px;
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-light);
+  border-radius: var(--wms-card-radius);
+}
+
+.wms-home__toolbar-main {
+  display: flex;
+  flex: 1;
+  flex-wrap: wrap;
+  gap: 16px;
+  align-items: center;
+  justify-content: space-between;
+  min-width: 320px;
+}
+
+.wms-home__title {
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 28px;
+  color: var(--el-text-color-primary);
+}
+
+.wms-home__subtitle,
+.wms-home__card-subtitle,
+.wms-home__stat-time {
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+}
+
+.wms-home__filters {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  align-items: center;
+}
+
+.wms-home__summary-grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 16px;
+  margin-bottom: 16px;
+}
+
+.wms-home__summary-skeleton {
+  width: 100%;
+  height: 174px;
+  border-radius: var(--wms-card-radius);
+}
+
+.wms-home__summary-card,
+.wms-home__chart-card {
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-light);
+  border-radius: var(--wms-card-radius);
+  box-shadow: 0 8px 24px rgb(15 23 42 / 4%);
+}
+
+.wms-home__summary-card {
+  min-height: 154px;
+  padding: 16px 18px;
+  border-top: 3px solid var(--theme-color);
+}
+
+.wms-home__summary-head,
+.wms-home__card-head {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.wms-home__summary-title {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.wms-home__summary-title span {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+}
+
+.wms-home__summary-total {
+  display: flex;
+  gap: 8px;
+  align-items: baseline;
+  margin-top: 18px;
+}
+
+.wms-home__summary-total span {
+  font-size: 32px;
+  font-weight: 700;
+  line-height: 38px;
+  color: var(--el-text-color-primary);
+}
+
+.wms-home__summary-total em {
+  font-style: normal;
+  color: var(--el-text-color-secondary);
+}
+
+.wms-home__status-bar {
+  display: flex;
+  height: 8px;
+  margin-top: 14px;
+  overflow: hidden;
+  background: var(--el-fill-color-light);
+  border-radius: 999px;
+}
+
+.wms-home__status-list {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 8px;
+  margin-top: 14px;
+}
+
+.wms-home__status-list div {
+  min-width: 0;
+}
+
+.wms-home__status-list span {
+  display: block;
+  overflow: hidden;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.wms-home__status-list strong {
+  display: block;
+  margin-top: 2px;
+  font-size: 16px;
+}
+
+.wms-home__chart-card {
+  margin-bottom: 16px;
+  padding: 18px;
+}
+
+.wms-home__card-head {
+  margin-bottom: 12px;
+}
+
+.wms-home__card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.wms-home__total-quantity {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.wms-home__stat-time {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 2px;
+}
+
+@media (max-width: 1200px) {
+  .wms-home__summary-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (max-width: 640px) {
+  .wms-home__toolbar-main,
+  .wms-home__filters {
+    width: 100%;
+  }
+
+  .wms-home__summary-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .wms-home__card-head {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
+</style>

From ae54f938cf344c98a9067ead5c924d3ab705fd91 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 22:35:53 +0800
Subject: [PATCH 28/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/home/index.ts                     |  18 +-
 .../components/WmsHomeInventoryCharts.vue     | 209 ++++++
 .../components/WmsHomeOrderSummaryCards.vue   | 219 ++++++
 .../components/WmsHomeOrderTrendChart.vue     | 174 +++++
 src/views/wms/home/index.vue                  | 686 +-----------------
 src/views/wms/inventory/history/index.vue     |   8 +-
 src/views/wms/inventory/index/index.vue       |  14 +-
 .../md/item/sku/components/ItemSkuSelect.vue  |  12 +-
 .../wms/order/check/CheckOrderDetail.vue      |  62 +-
 src/views/wms/order/check/CheckOrderForm.vue  | 103 ++-
 src/views/wms/order/check/CheckOrderPrint.vue |  26 +-
 src/views/wms/order/check/index.vue           | 161 ++--
 .../order/movement/MovementOrderDetail.vue    |  15 +-
 .../wms/order/movement/MovementOrderForm.vue  |  75 +-
 src/views/wms/order/movement/index.vue        | 140 ++--
 .../wms/order/receipt/ReceiptOrderForm.vue    |  37 +-
 .../wms/order/receipt/ReceiptOrderPrint.vue   |   7 +-
 src/views/wms/order/receipt/index.vue         |  74 +-
 .../wms/order/shipment/ShipmentOrderForm.vue  |  42 +-
 .../wms/order/shipment/ShipmentOrderPrint.vue |   7 +-
 src/views/wms/order/shipment/index.vue        |  74 +-
 21 files changed, 1184 insertions(+), 979 deletions(-)
 create mode 100644 src/views/wms/home/components/WmsHomeInventoryCharts.vue
 create mode 100644 src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
 create mode 100644 src/views/wms/home/components/WmsHomeOrderTrendChart.vue

diff --git a/src/api/wms/home/index.ts b/src/api/wms/home/index.ts
index 68cf18c5f..3c747bd87 100644
--- a/src/api/wms/home/index.ts
+++ b/src/api/wms/home/index.ts
@@ -3,26 +3,26 @@ import request from '@/config/axios'
 // WMS 首页统计查询参数
 export interface WmsHomeStatisticsReqVO {
   warehouseId?: number
+  goodsLimit?: number
+  warehouseLimit?: number
 }
 
 // WMS 首页单据状态统计 VO
 export interface WmsHomeOrderStatusVO {
   status: number
-  statusName: string
   count: number
 }
 
 // WMS 首页单据汇总统计 VO
 export interface WmsHomeOrderSummaryVO {
-  orderType: number
-  orderTypeName: string
+  type: number
   total: number
-  statusList: WmsHomeOrderStatusVO[]
+  statuses: WmsHomeOrderStatusVO[]
 }
 
 // WMS 首页单据趋势 VO
 export interface WmsHomeOrderTrendVO {
-  date: string
+  time: string | number
   receiptCount: number
   shipmentCount: number
   movementCount: number
@@ -31,15 +31,15 @@ export interface WmsHomeOrderTrendVO {
 
 // WMS 首页商品库存排行 VO
 export interface WmsHomeInventoryItemRankVO {
-  itemId: number
-  itemName: string
+  id: number
+  name: string
   quantity: number
 }
 
 // WMS 首页仓库库存排行 VO
 export interface WmsHomeInventoryWarehouseRankVO {
-  warehouseId: number
-  warehouseName: string
+  id: number
+  name: string
   quantity: number
 }
 
diff --git a/src/views/wms/home/components/WmsHomeInventoryCharts.vue b/src/views/wms/home/components/WmsHomeInventoryCharts.vue
new file mode 100644
index 000000000..1eaeef6a3
--- /dev/null
+++ b/src/views/wms/home/components/WmsHomeInventoryCharts.vue
@@ -0,0 +1,209 @@
+<template>
+  <el-row :gutter="16">
+    <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
+      <div
+        class="mb-16px border border-[var(--el-border-color-light)] border-solid rounded-[var(--wms-card-radius)] bg-[var(--el-bg-color)] p-18px shadow-[0_8px_24px_rgba(15,23,42,0.04)]"
+      >
+        <div
+          class="mb-12px flex items-center justify-between gap-12px lt-sm:flex-col lt-sm:items-start"
+        >
+          <div>
+            <div class="text-16px font-600 text-[var(--el-text-color-primary)]">货物占比</div>
+            <div class="text-13px text-[var(--el-text-color-secondary)]">
+              按商品库存数量汇总 Top 5
+            </div>
+          </div>
+        </div>
+        <el-skeleton :loading="loading" animated>
+          <Echart :height="300" :options="goodsShareChartOptions" />
+        </el-skeleton>
+      </div>
+    </el-col>
+    <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
+      <div
+        class="mb-16px border border-[var(--el-border-color-light)] border-solid rounded-[var(--wms-card-radius)] bg-[var(--el-bg-color)] p-18px shadow-[0_8px_24px_rgba(15,23,42,0.04)]"
+      >
+        <div
+          class="mb-12px flex items-center justify-between gap-12px lt-sm:flex-col lt-sm:items-start"
+        >
+          <div>
+            <div class="text-16px font-600 text-[var(--el-text-color-primary)]">库存分布</div>
+            <div class="text-13px text-[var(--el-text-color-secondary)]">按仓库库存数量汇总</div>
+          </div>
+          <div class="text-14px font-600 text-[var(--el-text-color-primary)]">
+            总库存 {{ formatQuantityText(totalQuantity) }}
+          </div>
+        </div>
+        <el-skeleton :loading="loading" animated>
+          <Echart :height="300" :options="inventoryDistributionChartOptions" />
+        </el-skeleton>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script lang="ts" setup>
+import type { EChartsOption } from 'echarts'
+import { WmsHomeStatisticsApi } from '@/api/wms/home'
+import { formatQuantity } from '@/views/wms/utils/format'
+
+defineOptions({ name: 'WmsHomeInventoryCharts' })
+
+interface ChartItem {
+  name: string
+  value: number
+}
+
+const GOODS_SHARE_LIMIT = 5
+const WAREHOUSE_DISTRIBUTION_LIMIT = 8
+
+const loading = ref(false)
+const totalQuantity = ref(0)
+const goodsShareList = ref<ChartItem[]>([])
+const inventoryDistributionList = ref<ChartItem[]>([])
+
+/** 格式化库存数量展示 */
+const formatQuantityText = (value: number) => formatQuantity(value) || '0.00'
+
+const chartFontFamily =
+  "Inter, 'Helvetica Neue', Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif"
+const chartTextStyle = {
+  color: '#303133',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  fontWeight: 400,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+const chartAxisLabelStyle = {
+  color: '#8a9099',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+
+/** 构建图表数据项，并过滤零库存数据 */
+const buildChartItemList = <T,>(
+  list: T[] | undefined,
+  nameGetter: (item: T) => string,
+  valueGetter: (item: T) => number | undefined
+) => {
+  return (list || [])
+    .map((item) => ({
+      name: nameGetter(item),
+      value: Number(valueGetter(item) || 0)
+    }))
+    .filter((item) => item.value > 0)
+}
+
+/** 格式化货物占比图例，补充库存占比 */
+const formatGoodsLegend = (name: string) => {
+  const total = goodsShareList.value.reduce((sum, item) => sum + item.value, 0)
+  const item = goodsShareList.value.find((goods) => goods.name === name)
+  if (!total || !item) {
+    return name
+  }
+  return `${name}  ${((item.value / total) * 100).toFixed(1)}%`
+}
+
+/** 加载库存汇总数据 */
+const load = async (warehouseId?: number) => {
+  loading.value = true
+  try {
+    const data = await WmsHomeStatisticsApi.getInventorySummary({
+      ...(warehouseId ? { warehouseId } : {}),
+      goodsLimit: GOODS_SHARE_LIMIT,
+      warehouseLimit: WAREHOUSE_DISTRIBUTION_LIMIT
+    })
+    totalQuantity.value = Number(data.totalQuantity || 0)
+    goodsShareList.value = buildChartItemList(
+      data.goodsShareList,
+      (item) => item.name || '未命名商品',
+      (item) => item.quantity
+    )
+    inventoryDistributionList.value = buildChartItemList(
+      data.warehouseDistributionList,
+      (item) => item.name || '未指定仓库',
+      (item) => item.quantity
+    )
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 货物占比图表配置 */
+const goodsShareChartOptions = computed<EChartsOption>(() => ({
+  color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'],
+  textStyle: chartTextStyle,
+  tooltip: {
+    trigger: 'item',
+    formatter: '{b}<br/>库存：{c} ({d}%)'
+  },
+  legend: {
+    type: 'scroll',
+    orient: 'vertical',
+    right: 10,
+    top: 'middle',
+    itemWidth: 10,
+    itemHeight: 10,
+    formatter: formatGoodsLegend,
+    textStyle: chartTextStyle
+  },
+  series: [
+    {
+      name: '货物占比',
+      type: 'pie',
+      radius: ['48%', '70%'],
+      center: ['34%', '52%'],
+      avoidLabelOverlap: true,
+      label: { show: false },
+      labelLine: { show: false },
+      data: goodsShareList.value
+    }
+  ]
+}))
+
+/** 库存分布图表配置 */
+const inventoryDistributionChartOptions = computed<EChartsOption>(() => ({
+  color: ['#2f7df6'],
+  grid: { top: 12, left: 24, right: 40, bottom: 16, containLabel: true },
+  textStyle: chartTextStyle,
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'shadow' },
+    formatter: (params: any) => {
+      const item = Array.isArray(params) ? params[0] : params
+      return `${item.name}<br/>库存：${formatQuantityText(item.value)}`
+    }
+  },
+  xAxis: {
+    type: 'value',
+    axisLabel: chartAxisLabelStyle,
+    splitLine: { lineStyle: { color: '#eef2f7' } }
+  },
+  yAxis: {
+    type: 'category',
+    data: inventoryDistributionList.value.map((item) => item.name).reverse(),
+    axisLabel: chartAxisLabelStyle,
+    axisTick: { show: false },
+    axisLine: { show: false }
+  },
+  series: [
+    {
+      name: '库存',
+      type: 'bar',
+      barMaxWidth: 16,
+      data: inventoryDistributionList.value.map((item) => item.value).reverse(),
+      label: {
+        show: true,
+        position: 'right',
+        ...chartTextStyle,
+        formatter: ({ value }) => formatQuantityText(Number(value))
+      }
+    }
+  ]
+}))
+
+defineExpose({ load })
+</script>
diff --git a/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
new file mode 100644
index 000000000..a87a70bc0
--- /dev/null
+++ b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-skeleton :loading="loading" animated>
+    <template #template>
+      <div class="mb-16px grid grid-cols-4 gap-16px lt-sm:grid-cols-1 lt-xl:grid-cols-2">
+        <el-skeleton-item
+          v-for="item in 4"
+          :key="item"
+          class="h-174px w-full rounded-[var(--wms-card-radius)]"
+        />
+      </div>
+    </template>
+    <div class="mb-16px grid grid-cols-4 gap-16px lt-sm:grid-cols-1 lt-xl:grid-cols-2">
+      <div
+        v-for="item in summaryList"
+        :key="item.orderType"
+        class="min-h-154px border border-t-3 border-[var(--el-border-color-light)] border-t-[var(--theme-color)] border-solid rounded-[var(--wms-card-radius)] bg-[var(--el-bg-color)] px-18px py-16px shadow-[0_8px_24px_rgba(15,23,42,0.04)]"
+        :style="{ '--theme-color': item.color }"
+      >
+        <div class="flex items-center justify-between gap-12px">
+          <div
+            class="flex items-center gap-8px text-15px font-600 text-[var(--el-text-color-primary)]"
+          >
+            <span class="h-8px w-8px rounded-full" :style="{ backgroundColor: item.color }"></span>
+            {{ item.title }}
+          </div>
+          <el-button link type="primary" @click="handleNavigate(item.routeName)">查看</el-button>
+        </div>
+        <div class="mt-18px flex items-baseline gap-8px">
+          <em class="not-italic text-[var(--el-text-color-secondary)]">合计</em>
+          <span class="text-32px font-700 leading-38px text-[var(--el-text-color-primary)]">{{
+            formatCount(item.total)
+          }}</span>
+          <em class="not-italic text-[var(--el-text-color-secondary)]">单</em>
+        </div>
+        <div
+          class="mt-14px h-8px flex overflow-hidden rounded-full bg-[var(--el-fill-color-light)]"
+        >
+          <span
+            v-for="status in statusList"
+            :key="status.value"
+            class="h-full"
+            :style="{
+              width: getStatusPercent(item, status.value),
+              backgroundColor: status.color
+            }"
+          ></span>
+        </div>
+        <div class="mt-14px grid grid-cols-3 gap-8px">
+          <div v-for="status in statusList" :key="status.value" class="min-w-0">
+            <span class="block truncate text-12px text-[var(--el-text-color-secondary)]">
+              {{ status.label }}
+            </span>
+            <strong class="mt-2px block text-16px" :style="{ color: status.color }">{{
+              item.statusCounts[status.value]
+            }}</strong>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-skeleton>
+</template>
+
+<script lang="ts" setup>
+import { useRouter } from 'vue-router'
+import { WmsHomeStatisticsApi } from '@/api/wms/home'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { OrderStatusEnum } from '@/views/wms/utils/constants'
+
+defineOptions({ name: 'WmsHomeOrderSummaryCards' })
+
+interface StatusItem {
+  label: string
+  value: number
+  color: string
+}
+
+interface OrderDefinition {
+  orderType: number
+  title: string
+  color: string
+  routeName: string
+}
+
+interface OrderSummaryItem extends OrderDefinition {
+  total: number
+  statusCounts: Record<number, number>
+}
+
+const router = useRouter()
+const message = useMessage()
+
+const OrderTypeEnum = {
+  RECEIPT: 1,
+  SHIPMENT: 2,
+  MOVEMENT: 3,
+  CHECK: 4
+} as const
+
+/** 获取单据类型名称 */
+const getOrderTypeTitle = (type: number, defaultTitle: string) => {
+  const label = getDictLabel(DICT_TYPE.WMS_ORDER_TYPE, type) || defaultTitle
+  return label.endsWith('单') ? label.slice(0, -1) : label
+}
+
+/** 获取单据状态名称 */
+const getOrderStatusLabel = (status: number, defaultLabel: string) => {
+  return getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, status) || defaultLabel
+}
+
+const loading = ref(false)
+const statusList: StatusItem[] = [
+  {
+    label: getOrderStatusLabel(OrderStatusEnum.PREPARE, '草稿'),
+    value: OrderStatusEnum.PREPARE,
+    color: '#409eff'
+  },
+  {
+    label: getOrderStatusLabel(OrderStatusEnum.FINISHED, '已完成'),
+    value: OrderStatusEnum.FINISHED,
+    color: '#67c23a'
+  },
+  {
+    label: getOrderStatusLabel(OrderStatusEnum.CANCELED, '已作废'),
+    value: OrderStatusEnum.CANCELED,
+    color: '#909399'
+  }
+]
+const orderDefinitions: OrderDefinition[] = [
+  {
+    orderType: OrderTypeEnum.RECEIPT,
+    title: getOrderTypeTitle(OrderTypeEnum.RECEIPT, '入库'),
+    color: '#2f7df6',
+    routeName: 'WmsReceiptOrder'
+  },
+  {
+    orderType: OrderTypeEnum.SHIPMENT,
+    title: getOrderTypeTitle(OrderTypeEnum.SHIPMENT, '出库'),
+    color: '#18a058',
+    routeName: 'WmsShipmentOrder'
+  },
+  {
+    orderType: OrderTypeEnum.MOVEMENT,
+    title: getOrderTypeTitle(OrderTypeEnum.MOVEMENT, '移库'),
+    color: '#f59e0b',
+    routeName: 'WmsMovementOrder'
+  },
+  {
+    orderType: OrderTypeEnum.CHECK,
+    title: getOrderTypeTitle(OrderTypeEnum.CHECK, '盘库'),
+    color: '#7c3aed',
+    routeName: 'WmsCheckOrder'
+  }
+]
+
+/** 构建默认的状态数量集合 */
+const buildEmptyStatusCounts = () => {
+  return statusList.reduce(
+    (result, status) => {
+      result[status.value] = 0
+      return result
+    },
+    {} as Record<number, number>
+  )
+}
+
+const summaryList = ref<OrderSummaryItem[]>(
+  orderDefinitions.map((item) => ({
+    ...item,
+    total: 0,
+    statusCounts: buildEmptyStatusCounts()
+  }))
+)
+
+/** 加载单据汇总数据 */
+const load = async (warehouseId?: number) => {
+  loading.value = true
+  try {
+    const data = await WmsHomeStatisticsApi.getOrderSummary(warehouseId ? { warehouseId } : {})
+    summaryList.value = orderDefinitions.map((definition) => {
+      const summary = data.find((item) => item.type === definition.orderType)
+      const statusCounts = statusList.reduce((result, status) => {
+        const statusItem = summary?.statuses?.find((item) => item.status === status.value)
+        result[status.value] = statusItem?.count || 0
+        return result
+      }, buildEmptyStatusCounts())
+      return {
+        ...definition,
+        total: summary?.total || 0,
+        statusCounts
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 跳转到对应单据列表 */
+const handleNavigate = async (name: string) => {
+  try {
+    await router.push({ name })
+  } catch {
+    message.warning('当前菜单尚未加载，请从左侧菜单进入对应页面')
+  }
+}
+
+/** 计算状态进度条占比 */
+const getStatusPercent = (item: OrderSummaryItem, status: number) => {
+  const count = item.statusCounts[status] || 0
+  if (!item.total || !count) {
+    return '0%'
+  }
+  return `${Math.max((count / item.total) * 100, 4)}%`
+}
+
+/** 格式化单据数量 */
+const formatCount = (value: number) => value.toLocaleString()
+
+defineExpose({ load })
+</script>
diff --git a/src/views/wms/home/components/WmsHomeOrderTrendChart.vue b/src/views/wms/home/components/WmsHomeOrderTrendChart.vue
new file mode 100644
index 000000000..06c152850
--- /dev/null
+++ b/src/views/wms/home/components/WmsHomeOrderTrendChart.vue
@@ -0,0 +1,174 @@
+<template>
+  <div
+    class="mb-16px border border-[var(--el-border-color-light)] border-solid rounded-[var(--wms-card-radius)] bg-[var(--el-bg-color)] p-18px shadow-[0_8px_24px_rgba(15,23,42,0.04)]"
+  >
+    <div
+      class="mb-12px flex items-center justify-between gap-12px lt-sm:flex-col lt-sm:items-start"
+    >
+      <div>
+        <div class="text-16px font-600 text-[var(--el-text-color-primary)]">单据趋势</div>
+        <div class="text-13px text-[var(--el-text-color-secondary)]">
+          入库、出库、移库、盘库单据数量
+        </div>
+      </div>
+      <el-segmented
+        v-model="trendDays"
+        :options="trendDayOptions"
+        @change="handleTrendDaysChange"
+      />
+    </div>
+    <el-skeleton :loading="loading" animated>
+      <Echart :height="330" :options="chartOptions" />
+    </el-skeleton>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { EChartsOption } from 'echarts'
+import { WmsHomeStatisticsApi, type WmsHomeOrderTrendVO } from '@/api/wms/home'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'WmsHomeOrderTrendChart' })
+
+interface OrderDefinition {
+  orderType: number
+  title: string
+  color: string
+  trendField: keyof Pick<
+    WmsHomeOrderTrendVO,
+    'receiptCount' | 'shipmentCount' | 'movementCount' | 'checkCount'
+  >
+}
+
+const OrderTypeEnum = {
+  RECEIPT: 1,
+  SHIPMENT: 2,
+  MOVEMENT: 3,
+  CHECK: 4
+} as const
+
+/** 获取单据类型名称 */
+const getOrderTypeTitle = (type: number, defaultTitle: string) => {
+  const label = getDictLabel(DICT_TYPE.WMS_ORDER_TYPE, type) || defaultTitle
+  return label.endsWith('单') ? label.slice(0, -1) : label
+}
+
+const orderDefinitions: OrderDefinition[] = [
+  {
+    orderType: OrderTypeEnum.RECEIPT,
+    title: getOrderTypeTitle(OrderTypeEnum.RECEIPT, '入库'),
+    color: '#2f7df6',
+    trendField: 'receiptCount'
+  },
+  {
+    orderType: OrderTypeEnum.SHIPMENT,
+    title: getOrderTypeTitle(OrderTypeEnum.SHIPMENT, '出库'),
+    color: '#18a058',
+    trendField: 'shipmentCount'
+  },
+  {
+    orderType: OrderTypeEnum.MOVEMENT,
+    title: getOrderTypeTitle(OrderTypeEnum.MOVEMENT, '移库'),
+    color: '#f59e0b',
+    trendField: 'movementCount'
+  },
+  {
+    orderType: OrderTypeEnum.CHECK,
+    title: getOrderTypeTitle(OrderTypeEnum.CHECK, '盘库'),
+    color: '#7c3aed',
+    trendField: 'checkCount'
+  }
+]
+const trendDayOptions = [
+  { label: '近7天', value: 7 },
+  { label: '近30天', value: 30 }
+]
+
+const loading = ref(false)
+const warehouseId = ref<number>()
+const trendDays = ref(7)
+const trendLabels = ref<string[]>([])
+const trendSeriesMap = reactive<Record<number, number[]>>({
+  [OrderTypeEnum.RECEIPT]: [],
+  [OrderTypeEnum.SHIPMENT]: [],
+  [OrderTypeEnum.MOVEMENT]: [],
+  [OrderTypeEnum.CHECK]: []
+})
+
+const chartFontFamily =
+  "Inter, 'Helvetica Neue', Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif"
+const chartTextStyle = {
+  color: '#303133',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  fontWeight: 400,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+const chartAxisLabelStyle = {
+  color: '#8a9099',
+  fontFamily: chartFontFamily,
+  fontSize: 12,
+  textBorderWidth: 0,
+  textShadowBlur: 0
+}
+
+/** 加载单据趋势数据 */
+const load = async (selectedWarehouseId?: number) => {
+  warehouseId.value = selectedWarehouseId
+  loading.value = true
+  try {
+    const data = await WmsHomeStatisticsApi.getOrderTrend(
+      trendDays.value,
+      selectedWarehouseId ? { warehouseId: selectedWarehouseId } : {}
+    )
+    trendLabels.value = data.map((item) => formatDate(new Date(item.time), 'MM-DD'))
+    orderDefinitions.forEach((definition) => {
+      trendSeriesMap[definition.orderType] = data.map((item) =>
+        Number(item[definition.trendField] || 0)
+      )
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 切换趋势统计天数 */
+const handleTrendDaysChange = async () => {
+  await load(warehouseId.value)
+}
+
+/** 单据趋势图表配置 */
+const chartOptions = computed<EChartsOption>(() => ({
+  color: orderDefinitions.map((item) => item.color),
+  grid: { top: 48, left: 28, right: 24, bottom: 24, containLabel: true },
+  textStyle: chartTextStyle,
+  legend: { top: 6, itemWidth: 10, itemHeight: 10, textStyle: chartTextStyle },
+  tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+  xAxis: {
+    type: 'category',
+    data: trendLabels.value,
+    axisLabel: chartAxisLabelStyle,
+    axisTick: { show: false },
+    axisLine: { lineStyle: { color: '#dcdfe6' } }
+  },
+  yAxis: {
+    type: 'value',
+    name: '单据数',
+    nameTextStyle: chartAxisLabelStyle,
+    axisLabel: chartAxisLabelStyle,
+    minInterval: 1,
+    splitLine: { lineStyle: { color: '#eef2f7' } }
+  },
+  series: orderDefinitions.map((item) => ({
+    name: item.title,
+    type: 'bar',
+    barMaxWidth: 18,
+    data: trendSeriesMap[item.orderType],
+    emphasis: { focus: 'series' }
+  }))
+}))
+
+defineExpose({ load })
+</script>
diff --git a/src/views/wms/home/index.vue b/src/views/wms/home/index.vue
index 20f1fc0b1..08b38e592 100644
--- a/src/views/wms/home/index.vue
+++ b/src/views/wms/home/index.vue
@@ -1,29 +1,25 @@
-<!-- TODO @AI：组件拆分下。 -->
 <template>
-  <div class="wms-home">
-    <div class="wms-home__toolbar">
-      <div class="wms-home__toolbar-main">
+  <div class="[--wms-card-radius:8px]">
+    <div
+      class="mb-16px flex flex-wrap justify-between gap-16px rounded-[var(--wms-card-radius)] border border-[var(--el-border-color-light)] border-solid bg-[var(--el-bg-color)] p-16px"
+    >
+      <div
+        class="flex min-w-320px flex-1 flex-wrap items-center justify-between gap-16px lt-sm:w-full"
+      >
         <div>
-          <div class="wms-home__title">WMS 首页</div>
-          <div class="wms-home__subtitle">单据工作台 / 库存概览</div>
+          <div class="text-20px font-600 leading-28px text-[var(--el-text-color-primary)]">
+            WMS 首页
+          </div>
+          <div class="text-13px text-[var(--el-text-color-secondary)]">单据工作台 / 库存概览</div>
         </div>
-        <div class="wms-home__filters">
-          <el-select
+        <div class="flex flex-wrap items-center gap-8px lt-sm:w-full">
+          <WarehouseSelect
             v-model="warehouseId"
             class="!w-220px"
-            clearable
-            filterable
             placeholder="全部仓库"
-            @change="refresh"
-          >
-            <el-option
-              v-for="warehouse in warehouseList"
-              :key="warehouse.id!"
-              :label="warehouse.name"
-              :value="warehouse.id!"
-            />
-          </el-select>
-          <el-button :loading="loading || trendLoading || inventoryLoading" @click="refresh">
+            @change="refresh()"
+          />
+          <el-button :loading="loading" @click="refresh">
             <Icon class="mr-5px" icon="ep:refresh" />
             刷新
           </el-button>
@@ -31,97 +27,13 @@
       </div>
     </div>
 
-    <el-skeleton :loading="loading" animated>
-      <template #template>
-        <div class="wms-home__summary-grid">
-          <el-skeleton-item v-for="item in 4" :key="item" class="wms-home__summary-skeleton" />
-        </div>
-      </template>
-      <div class="wms-home__summary-grid">
-        <div
-          v-for="item in orderSummaries"
-          :key="item.key"
-          class="wms-home__summary-card"
-          :style="{ '--theme-color': item.color }"
-        >
-          <div class="wms-home__summary-head">
-            <div class="wms-home__summary-title">
-              <span :style="{ backgroundColor: item.color }"></span>
-              {{ item.title }}
-            </div>
-            <el-button link type="primary" @click="handleNavigate(item.routeName)">查看</el-button>
-          </div>
-          <div class="wms-home__summary-total">
-            <em>合计</em>
-            <span>{{ formatCount(item.total) }}</span>
-            <em>单</em>
-          </div>
-          <div class="wms-home__status-bar">
-            <span
-              v-for="status in statusList"
-              :key="status.key"
-              :style="{
-                width: getStatusPercent(item, status.key),
-                backgroundColor: status.color
-              }"
-            ></span>
-          </div>
-          <div class="wms-home__status-list">
-            <div v-for="status in statusList" :key="status.key">
-              <span>{{ status.label }}</span>
-              <strong :style="{ color: status.color }">{{ item.statusCounts[status.key] }}</strong>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-skeleton>
+    <WmsHomeOrderSummaryCards ref="orderSummaryCardsRef" />
+    <WmsHomeOrderTrendChart ref="orderTrendChartRef" />
+    <WmsHomeInventoryCharts ref="inventoryChartsRef" />
 
-    <div class="wms-home__chart-card">
-      <div class="wms-home__card-head">
-        <div>
-          <div class="wms-home__card-title">单据趋势</div>
-          <div class="wms-home__card-subtitle">入库、出库、移库、盘库单据数量</div>
-        </div>
-        <el-segmented v-model="trendDays" :options="trendDayOptions" @change="loadTrendData" />
-      </div>
-      <el-skeleton :loading="trendLoading" animated>
-        <Echart :height="330" :options="trendChartOptions" />
-      </el-skeleton>
-    </div>
-
-    <el-row :gutter="16">
-      <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
-        <div class="wms-home__chart-card">
-          <div class="wms-home__card-head">
-            <div>
-              <div class="wms-home__card-title">货物占比</div>
-              <div class="wms-home__card-subtitle">按商品库存数量汇总 Top 5</div>
-            </div>
-          </div>
-          <el-skeleton :loading="inventoryLoading" animated>
-            <Echart :height="300" :options="goodsShareChartOptions" />
-          </el-skeleton>
-        </div>
-      </el-col>
-      <el-col :lg="12" :md="24" :sm="24" :xl="12" :xs="24">
-        <div class="wms-home__chart-card">
-          <div class="wms-home__card-head">
-            <div>
-              <div class="wms-home__card-title">库存分布</div>
-              <div class="wms-home__card-subtitle">按仓库库存数量汇总</div>
-            </div>
-            <div class="wms-home__total-quantity"
-              >总库存 {{ formatQuantityText(totalQuantity) }}</div
-            >
-          </div>
-          <el-skeleton :loading="inventoryLoading" animated>
-            <Echart :height="300" :options="inventoryDistributionChartOptions" />
-          </el-skeleton>
-        </div>
-      </el-col>
-    </el-row>
-
-    <div class="wms-home__stat-time">
+    <div
+      class="mt-2px flex items-center justify-center text-13px text-[var(--el-text-color-secondary)]"
+    >
       <Icon class="mr-5px" icon="ep:clock" />
       统计时间：{{ statTime }}
     </div>
@@ -129,562 +41,38 @@
 </template>
 
 <script lang="ts" setup>
-import { EChartsOption } from 'echarts'
-import { useRouter } from 'vue-router'
-import { WmsHomeOrderTrendVO, WmsHomeStatisticsApi, WmsHomeStatisticsReqVO } from '@/api/wms/home'
-import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
-import { OrderStatusEnum } from '@/views/wms/utils/constants'
-import { formatQuantity } from '@/views/wms/utils/format'
 import { formatDate } from '@/utils/formatTime'
+import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
+import WmsHomeInventoryCharts from './components/WmsHomeInventoryCharts.vue'
+import WmsHomeOrderSummaryCards from './components/WmsHomeOrderSummaryCards.vue'
+import WmsHomeOrderTrendChart from './components/WmsHomeOrderTrendChart.vue'
 
 /** WMS 首页 */
 defineOptions({ name: 'WmsHome' })
 
-type StatusKey = 'prepare' | 'finished' | 'canceled'
-type OrderKey = 'receipt' | 'shipment' | 'movement' | 'check'
-
-interface OrderDefinition {
-  key: OrderKey
-  orderType: number
-  title: string
-  color: string
-  routeName: string
-  trendField: keyof Pick<
-    WmsHomeOrderTrendVO,
-    'receiptCount' | 'shipmentCount' | 'movementCount' | 'checkCount'
-  >
-}
-
-interface OrderSummary extends OrderDefinition {
-  total: number
-  statusCounts: Record<StatusKey, number>
-}
-
-interface ChartItem {
-  name: string
-  value: number
-}
-
-const router = useRouter()
-const message = useMessage()
-
-const statusList: Array<{ key: StatusKey; label: string; value: number; color: string }> = [
-  { key: 'prepare', label: '草稿', value: OrderStatusEnum.PREPARE, color: '#409eff' },
-  { key: 'finished', label: '已完成', value: OrderStatusEnum.FINISHED, color: '#67c23a' },
-  { key: 'canceled', label: '已作废', value: OrderStatusEnum.CANCELED, color: '#909399' }
-]
-
-const OrderTypeEnum = {
-  RECEIPT: 1,
-  SHIPMENT: 2,
-  MOVEMENT: 3,
-  CHECK: 4
-} as const
-
-const orderDefinitions: OrderDefinition[] = [
-  {
-    key: 'receipt',
-    orderType: OrderTypeEnum.RECEIPT,
-    title: '入库',
-    color: '#2f7df6',
-    routeName: 'WmsReceiptOrder',
-    trendField: 'receiptCount'
-  },
-  {
-    key: 'shipment',
-    orderType: OrderTypeEnum.SHIPMENT,
-    title: '出库',
-    color: '#18a058',
-    routeName: 'WmsShipmentOrder',
-    trendField: 'shipmentCount'
-  },
-  {
-    key: 'movement',
-    orderType: OrderTypeEnum.MOVEMENT,
-    title: '移库',
-    color: '#f59e0b',
-    routeName: 'WmsMovementOrder',
-    trendField: 'movementCount'
-  },
-  {
-    key: 'check',
-    orderType: OrderTypeEnum.CHECK,
-    title: '盘库',
-    color: '#7c3aed',
-    routeName: 'WmsCheckOrder',
-    trendField: 'checkCount'
-  }
-]
-
-const trendDayOptions = [
-  { label: '近7天', value: 7 },
-  { label: '近30天', value: 30 }
-]
-
 const loading = ref(false)
-const trendLoading = ref(false)
-const inventoryLoading = ref(false)
 const warehouseId = ref<number>()
-const warehouseList = ref<WarehouseVO[]>([])
 const statTime = ref(formatDate(new Date()))
-const orderSummaries = ref<OrderSummary[]>(
-  orderDefinitions.map((item) => ({
-    ...item,
-    total: 0,
-    statusCounts: { prepare: 0, finished: 0, canceled: 0 }
-  }))
-)
-const trendDays = ref(7)
-const trendLabels = ref<string[]>([])
-const trendSeriesMap = reactive<Record<OrderKey, number[]>>({
-  receipt: [],
-  shipment: [],
-  movement: [],
-  check: []
-})
-const totalQuantity = ref(0)
-const goodsShareList = ref<ChartItem[]>([])
-const inventoryDistributionList = ref<ChartItem[]>([])
-
-const getStatisticsParams = (): WmsHomeStatisticsReqVO => {
-  return warehouseId.value ? { warehouseId: warehouseId.value } : {}
-}
-
-const loadOrderSummaries = async () => {
-  const data = await WmsHomeStatisticsApi.getOrderSummary(getStatisticsParams())
-  orderSummaries.value = orderDefinitions.map((definition) => {
-    const summary = data.find((item) => item.orderType === definition.orderType)
-    const statusCounts = statusList.reduce(
-      (result, status) => {
-        const statusItem = summary?.statusList?.find((item) => item.status === status.value)
-        result[status.key] = statusItem?.count || 0
-        return result
-      },
-      { prepare: 0, finished: 0, canceled: 0 } as Record<StatusKey, number>
-    )
-    return {
-      ...definition,
-      total: summary?.total || 0,
-      statusCounts
-    }
-  })
-}
-
-const buildChartItemList = <T,>(
-  list: T[] | undefined,
-  nameGetter: (item: T) => string,
-  valueGetter: (item: T) => number | undefined
-) => {
-  return (list || [])
-    .map((item) => ({
-      name: nameGetter(item),
-      value: Number(valueGetter(item) || 0)
-    }))
-    .filter((item) => item.value > 0)
-}
-
-const loadTrendData = async () => {
-  trendLoading.value = true
-  try {
-    const data = await WmsHomeStatisticsApi.getOrderTrend(trendDays.value, getStatisticsParams())
-    trendLabels.value = data.map((item) => item.date.substring(5))
-    orderDefinitions.forEach((definition) => {
-      trendSeriesMap[definition.key] = data.map((item) => Number(item[definition.trendField] || 0))
-    })
-  } finally {
-    trendLoading.value = false
-  }
-}
-
-const loadInventoryData = async () => {
-  inventoryLoading.value = true
-  try {
-    const data = await WmsHomeStatisticsApi.getInventorySummary(getStatisticsParams())
-    totalQuantity.value = Number(data.totalQuantity || 0)
-    goodsShareList.value = buildChartItemList(
-      data.goodsShareList,
-      (item) => item.itemName || '未命名商品',
-      (item) => item.quantity
-    )
-    inventoryDistributionList.value = buildChartItemList(
-      data.warehouseDistributionList,
-      (item) => item.warehouseName || '未指定仓库',
-      (item) => item.quantity
-    )
-  } finally {
-    inventoryLoading.value = false
-  }
-}
+const orderSummaryCardsRef = ref<InstanceType<typeof WmsHomeOrderSummaryCards>>()
+const orderTrendChartRef = ref<InstanceType<typeof WmsHomeOrderTrendChart>>()
+const inventoryChartsRef = ref<InstanceType<typeof WmsHomeInventoryCharts>>()
 
+/** 刷新：重新加载各个组件的数据（传入 warehouseId 以进行针对性查询），并更新时间戳 */
 const refresh = async () => {
   loading.value = true
   try {
-    await Promise.all([loadOrderSummaries(), loadTrendData(), loadInventoryData()])
+    await Promise.all([
+      orderSummaryCardsRef.value?.load(warehouseId.value),
+      orderTrendChartRef.value?.load(warehouseId.value),
+      inventoryChartsRef.value?.load(warehouseId.value)
+    ])
     statTime.value = formatDate(new Date())
   } finally {
     loading.value = false
   }
 }
 
-const loadWarehouseList = async () => {
-  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
-}
-
-const handleNavigate = async (name: string) => {
-  try {
-    await router.push({ name })
-  } catch {
-    message.warning('当前菜单尚未加载，请从左侧菜单进入对应页面')
-  }
-}
-
-const getStatusPercent = (item: OrderSummary, key: StatusKey) => {
-  if (!item.total) {
-    return `${100 / statusList.length}%`
-  }
-  return `${Math.max((item.statusCounts[key] / item.total) * 100, 4)}%`
-}
-
-const formatCount = (value: number) => value.toLocaleString()
-const formatQuantityText = (value: number) => formatQuantity(value) || '0.00'
-const chartFontFamily =
-  "Inter, 'Helvetica Neue', Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif"
-const chartTextStyle = {
-  color: '#303133',
-  fontFamily: chartFontFamily,
-  fontSize: 12,
-  fontWeight: 400,
-  textBorderWidth: 0,
-  textShadowBlur: 0
-}
-const chartAxisLabelStyle = {
-  color: '#8a9099',
-  fontFamily: chartFontFamily,
-  fontSize: 12,
-  textBorderWidth: 0,
-  textShadowBlur: 0
-}
-
-const formatGoodsLegend = (name: string) => {
-  const total = goodsShareList.value.reduce((sum, item) => sum + item.value, 0)
-  const item = goodsShareList.value.find((goods) => goods.name === name)
-  if (!total || !item) {
-    return name
-  }
-  return `${name}  ${((item.value / total) * 100).toFixed(1)}%`
-}
-
-const trendChartOptions = computed<EChartsOption>(() => ({
-  color: orderDefinitions.map((item) => item.color),
-  grid: { top: 48, left: 28, right: 24, bottom: 24, containLabel: true },
-  textStyle: chartTextStyle,
-  legend: { top: 6, itemWidth: 10, itemHeight: 10, textStyle: chartTextStyle },
-  tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-  xAxis: {
-    type: 'category',
-    data: trendLabels.value,
-    axisLabel: chartAxisLabelStyle,
-    axisTick: { show: false },
-    axisLine: { lineStyle: { color: '#dcdfe6' } }
-  },
-  yAxis: {
-    type: 'value',
-    name: '单据数',
-    nameTextStyle: chartAxisLabelStyle,
-    axisLabel: chartAxisLabelStyle,
-    minInterval: 1,
-    splitLine: { lineStyle: { color: '#eef2f7' } }
-  },
-  series: orderDefinitions.map((item) => ({
-    name: item.title,
-    type: 'bar',
-    barMaxWidth: 18,
-    data: trendSeriesMap[item.key],
-    emphasis: { focus: 'series' }
-  }))
-}))
-
-const goodsShareChartOptions = computed<EChartsOption>(() => ({
-  color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'],
-  textStyle: chartTextStyle,
-  tooltip: {
-    trigger: 'item',
-    formatter: '{b}<br/>库存：{c} ({d}%)'
-  },
-  legend: {
-    type: 'scroll',
-    orient: 'vertical',
-    right: 10,
-    top: 'middle',
-    itemWidth: 10,
-    itemHeight: 10,
-    formatter: formatGoodsLegend,
-    textStyle: chartTextStyle
-  },
-  series: [
-    {
-      name: '货物占比',
-      type: 'pie',
-      radius: ['48%', '70%'],
-      center: ['34%', '52%'],
-      avoidLabelOverlap: true,
-      label: { show: false },
-      labelLine: { show: false },
-      data: goodsShareList.value
-    }
-  ]
-}))
-
-const inventoryDistributionChartOptions = computed<EChartsOption>(() => ({
-  color: ['#2f7df6'],
-  grid: { top: 12, left: 24, right: 40, bottom: 16, containLabel: true },
-  textStyle: chartTextStyle,
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: { type: 'shadow' },
-    formatter: (params: any) => {
-      const item = Array.isArray(params) ? params[0] : params
-      return `${item.name}<br/>库存：${formatQuantityText(item.value)}`
-    }
-  },
-  xAxis: {
-    type: 'value',
-    axisLabel: chartAxisLabelStyle,
-    splitLine: { lineStyle: { color: '#eef2f7' } }
-  },
-  yAxis: {
-    type: 'category',
-    data: inventoryDistributionList.value.map((item) => item.name).reverse(),
-    axisLabel: chartAxisLabelStyle,
-    axisTick: { show: false },
-    axisLine: { show: false }
-  },
-  series: [
-    {
-      name: '库存',
-      type: 'bar',
-      barMaxWidth: 16,
-      data: inventoryDistributionList.value.map((item) => item.value).reverse(),
-      label: {
-        show: true,
-        position: 'right',
-        ...chartTextStyle,
-        formatter: ({ value }) => formatQuantityText(Number(value))
-      }
-    }
-  ]
-}))
-
-onMounted(async () => {
-  loading.value = true
-  try {
-    await loadWarehouseList()
-    await refresh()
-  } finally {
-    loading.value = false
-  }
+onMounted(() => {
+  refresh()
 })
 </script>
-
-<style lang="scss" scoped>
-.wms-home {
-  --wms-card-radius: 8px;
-}
-
-.wms-home__toolbar {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 16px;
-  justify-content: space-between;
-  margin-bottom: 16px;
-  padding: 16px;
-  background: var(--el-bg-color);
-  border: 1px solid var(--el-border-color-light);
-  border-radius: var(--wms-card-radius);
-}
-
-.wms-home__toolbar-main {
-  display: flex;
-  flex: 1;
-  flex-wrap: wrap;
-  gap: 16px;
-  align-items: center;
-  justify-content: space-between;
-  min-width: 320px;
-}
-
-.wms-home__title {
-  font-size: 20px;
-  font-weight: 600;
-  line-height: 28px;
-  color: var(--el-text-color-primary);
-}
-
-.wms-home__subtitle,
-.wms-home__card-subtitle,
-.wms-home__stat-time {
-  font-size: 13px;
-  color: var(--el-text-color-secondary);
-}
-
-.wms-home__filters {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  align-items: center;
-}
-
-.wms-home__summary-grid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(0, 1fr));
-  gap: 16px;
-  margin-bottom: 16px;
-}
-
-.wms-home__summary-skeleton {
-  width: 100%;
-  height: 174px;
-  border-radius: var(--wms-card-radius);
-}
-
-.wms-home__summary-card,
-.wms-home__chart-card {
-  background: var(--el-bg-color);
-  border: 1px solid var(--el-border-color-light);
-  border-radius: var(--wms-card-radius);
-  box-shadow: 0 8px 24px rgb(15 23 42 / 4%);
-}
-
-.wms-home__summary-card {
-  min-height: 154px;
-  padding: 16px 18px;
-  border-top: 3px solid var(--theme-color);
-}
-
-.wms-home__summary-head,
-.wms-home__card-head {
-  display: flex;
-  gap: 12px;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.wms-home__summary-title {
-  display: flex;
-  gap: 8px;
-  align-items: center;
-  font-size: 15px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.wms-home__summary-title span {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-}
-
-.wms-home__summary-total {
-  display: flex;
-  gap: 8px;
-  align-items: baseline;
-  margin-top: 18px;
-}
-
-.wms-home__summary-total span {
-  font-size: 32px;
-  font-weight: 700;
-  line-height: 38px;
-  color: var(--el-text-color-primary);
-}
-
-.wms-home__summary-total em {
-  font-style: normal;
-  color: var(--el-text-color-secondary);
-}
-
-.wms-home__status-bar {
-  display: flex;
-  height: 8px;
-  margin-top: 14px;
-  overflow: hidden;
-  background: var(--el-fill-color-light);
-  border-radius: 999px;
-}
-
-.wms-home__status-list {
-  display: grid;
-  grid-template-columns: repeat(3, minmax(0, 1fr));
-  gap: 8px;
-  margin-top: 14px;
-}
-
-.wms-home__status-list div {
-  min-width: 0;
-}
-
-.wms-home__status-list span {
-  display: block;
-  overflow: hidden;
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.wms-home__status-list strong {
-  display: block;
-  margin-top: 2px;
-  font-size: 16px;
-}
-
-.wms-home__chart-card {
-  margin-bottom: 16px;
-  padding: 18px;
-}
-
-.wms-home__card-head {
-  margin-bottom: 12px;
-}
-
-.wms-home__card-title {
-  font-size: 16px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.wms-home__total-quantity {
-  font-size: 14px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.wms-home__stat-time {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 2px;
-}
-
-@media (max-width: 1200px) {
-  .wms-home__summary-grid {
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-  }
-}
-
-@media (max-width: 640px) {
-  .wms-home__toolbar-main,
-  .wms-home__filters {
-    width: 100%;
-  }
-
-  .wms-home__summary-grid {
-    grid-template-columns: 1fr;
-  }
-
-  .wms-home__card-head {
-    align-items: flex-start;
-    flex-direction: column;
-  }
-}
-</style>
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index 42a7d46e1..e67855c39 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -102,7 +102,7 @@
     <div class="mb-12px text-16px font-500">库存流水</div>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-inventory-history-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -231,9 +231,3 @@ onMounted(async () => {
   await getList()
 })
 </script>
-
-<style scoped>
-:deep(.wms-inventory-history-cell) {
-  vertical-align: top;
-}
-</style>
diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue
index abf0e22c0..cb8dca3b3 100644
--- a/src/views/wms/inventory/index/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -11,11 +11,7 @@
     >
       <el-form-item label="统计维度" prop="type">
         <el-radio-group v-model="queryParams.type" class="!w-240px" @change="handleTypeChange">
-          <el-radio-button
-            v-for="item in dimensionOptions"
-            :key="item.value"
-            :label="item.value"
-          >
+          <el-radio-button v-for="item in dimensionOptions" :key="item.value" :label="item.value">
             {{ item.label }}
           </el-radio-button>
         </el-radio-group>
@@ -82,7 +78,7 @@
     </div>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-inventory-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       :span-method="spanMethod"
@@ -283,9 +279,3 @@ onMounted(async () => {
   await getList()
 })
 </script>
-
-<style scoped>
-:deep(.wms-inventory-cell) {
-  vertical-align: top;
-}
-</style>
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
index 313366b1f..06e03e3c5 100644
--- a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -91,7 +91,9 @@
             <div v-if="row.itemCode" class="text-12px text-gray-500">
               商品编号：{{ row.itemCode }}
             </div>
-            <div v-if="row.brandName" class="text-12px text-gray-500">品牌：{{ row.brandName }}</div>
+            <div v-if="row.brandName" class="text-12px text-gray-500">
+              品牌：{{ row.brandName }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="220">
@@ -104,13 +106,17 @@
         <el-table-column label="金额(元)" min-width="160">
           <template #default="{ row }">
             <div v-if="row.costPrice !== undefined">成本价：{{ formatPrice(row.costPrice) }}</div>
-            <div v-if="row.sellingPrice !== undefined">销售价：{{ formatPrice(row.sellingPrice) }}</div>
+            <div v-if="row.sellingPrice !== undefined">
+              销售价：{{ formatPrice(row.sellingPrice) }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="重量(kg)" min-width="160">
           <template #default="{ row }">
             <div v-if="row.netWeight !== undefined">净重：{{ formatWeight(row.netWeight) }}</div>
-            <div v-if="row.grossWeight !== undefined">毛重：{{ formatWeight(row.grossWeight) }}</div>
+            <div v-if="row.grossWeight !== undefined">
+              毛重：{{ formatWeight(row.grossWeight) }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="长宽高(cm)" min-width="180">
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 5bd29292e..dbfdc3113 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -5,7 +5,9 @@
       <div class="mb-16px text-18px font-bold">单据信息</div>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="盘库单号">{{ detailData.no || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="仓库">
+          {{ detailData.warehouseName || '-' }}
+        </el-descriptions-item>
         <el-descriptions-item label="单据日期">
           {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
         </el-descriptions-item>
@@ -45,7 +47,9 @@
         <el-descriptions-item label="更新人">
           {{ detailData.updaterName || detailData.updater || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item :span="2" label="备注">{{ detailData.remark || '-' }}</el-descriptions-item>
+        <el-descriptions-item :span="2" label="备注">
+          {{ detailData.remark || '-' }}
+        </el-descriptions-item>
       </el-descriptions>
 
       <div class="mb-16px mt-24px text-18px font-bold">商品明细</div>
@@ -53,13 +57,17 @@
         <el-table-column label="商品信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500"
+              >商品编号：{{ row.itemCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500"
+              >规格编号：{{ row.skuCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column align="right" label="账面数量" prop="quantity" width="120">
@@ -83,7 +91,9 @@
         </el-table-column>
         <el-table-column align="right" label="实际盈亏金额(元)" prop="differencePrice" width="160">
           <template #default="{ row }">
-            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) || '-' }}</span>
+            <span :class="getLossClass(getDifferencePrice(row))">{{
+              formatPrice(getDifferencePrice(row)) || '-'
+            }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -116,9 +126,15 @@ const dialogVisible = ref(false)
 const detailData = ref<CheckOrderVO>({})
 const getOrderDifferencePrice = (order: CheckOrderVO) =>
   roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
-const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getDifferenceQuantity = (detail: CheckOrderDetailVO) =>
+  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
 const getActualPrice = (detail: CheckOrderDetailVO) => {
-  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+  if (
+    detail.checkQuantity === undefined ||
+    detail.checkQuantity === null ||
+    detail.price === undefined ||
+    detail.price === null
+  ) {
     return undefined
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
@@ -129,20 +145,36 @@ const getDifferencePrice = (detail: CheckOrderDetailVO) => {
   }
   return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
 }
-const renderLossText = (value: number | string | null | undefined, formatter: (value?: number | string | null) => string) =>
-  h('span', { class: getLossClass(value) }, formatter(value))
+const renderLossText = (
+  value: number | string | null | undefined,
+  formatter: (value?: number | string | null) => string
+) => h('span', { class: getLossClass(value) }, formatter(value))
 
 const getSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderDetailVO[] }) =>
   columns.map((column, index) => {
-    if (index === 0) return '合计'
-    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
-    if (column.property === 'checkQuantity') return formatSumQuantity(data, (detail) => detail.checkQuantity)
-    if (column.property === 'actualPrice') return formatSumPrice(data, (detail) => getActualPrice(detail))
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'checkQuantity') {
+      return formatSumQuantity(data, (detail) => detail.checkQuantity)
+    }
+    if (column.property === 'actualPrice') {
+      return formatSumPrice(data, (detail) => getActualPrice(detail))
+    }
     if (column.property === 'differenceQuantity') {
-      return renderLossText(sumQuantity(data, (detail) => getDifferenceQuantity(detail)), formatQuantity)
+      return renderLossText(
+        sumQuantity(data, (detail) => getDifferenceQuantity(detail)),
+        formatQuantity
+      )
     }
     if (column.property === 'differencePrice') {
-      return renderLossText(sumPrice(data, (detail) => getDifferencePrice(detail)), formatPrice)
+      return renderLossText(
+        sumPrice(data, (detail) => getDifferencePrice(detail)),
+        formatPrice
+      )
     }
     return ''
   })
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 6297ab494..99db891cf 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -1,7 +1,13 @@
 <!-- WMS 盘库单表单 -->
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="92px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="92px"
+    >
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="盘库单号" prop="no">
@@ -31,7 +37,13 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
+            <el-input
+              v-model="formData.remark"
+              maxlength="255"
+              placeholder="请输入备注"
+              :rows="3"
+              type="textarea"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -40,7 +52,12 @@
         <span class="text-14px font-bold">盘库明细</span>
         <el-tooltip content="请先选择仓库" :disabled="!!formData.warehouseId" placement="top">
           <span>
-            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+            <el-button
+              :disabled="!formData.warehouseId"
+              plain
+              type="primary"
+              @click="handleAddDetail"
+            >
               <Icon class="mr-5px" icon="ep:plus" />
               添加商品
             </el-button>
@@ -57,13 +74,17 @@
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500"
+              >商品编号：{{ row.itemCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500"
+              >规格编号：{{ row.skuCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column align="right" label="账面库存" prop="quantity" width="120">
@@ -110,12 +131,16 @@
         </el-table-column>
         <el-table-column align="right" label="盈亏数" prop="differenceQuantity" width="120">
           <template #default="{ row }">
-            <span :class="getLossClass(getDifferenceQuantity(row))">{{ formatQuantity(getDifferenceQuantity(row)) }}</span>
+            <span :class="getLossClass(getDifferenceQuantity(row))">{{
+              formatQuantity(getDifferenceQuantity(row))
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column align="right" label="实际盈亏金额(元)" prop="differencePrice" width="160">
           <template #default="{ row }">
-            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) }}</span>
+            <span :class="getLossClass(getDifferencePrice(row))">{{
+              formatPrice(getDifferencePrice(row))
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="80">
@@ -153,7 +178,13 @@
           </el-button>
         </div>
         <div>
-          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">保存</el-button>
+          <el-button
+            v-if="isPrepareOrder"
+            :disabled="formLoading"
+            type="primary"
+            @click="submitForm"
+            >保存</el-button
+          >
           <el-button @click="dialogVisible = false">取 消</el-button>
         </div>
       </div>
@@ -166,7 +197,9 @@ import { FormRules } from 'element-plus'
 import { h } from 'vue'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
+import InventorySelect, {
+  InventorySelectRow
+} from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
@@ -217,20 +250,30 @@ const formRules = reactive<FormRules>({
 const formRef = ref()
 const inventorySelectRef = ref()
 
-const getDifferenceQuantity = (detail: CheckOrderFormDetail) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getDifferenceQuantity = (detail: CheckOrderFormDetail) =>
+  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
 const getBookPrice = (detail: CheckOrderFormDetail) => multiplyPrice(detail.quantity, detail.price)
-const getActualPrice = (detail: CheckOrderFormDetail) => detail.actualPrice ?? multiplyPrice(detail.checkQuantity, detail.price)
+const getActualPrice = (detail: CheckOrderFormDetail) =>
+  detail.actualPrice ?? multiplyPrice(detail.checkQuantity, detail.price)
 const getDifferencePrice = (detail: CheckOrderFormDetail) => {
   if (detail.price === undefined || detail.price === null) {
     return undefined
   }
   return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
 }
-const renderLossText = (value: number | string | null | undefined, formatter: (value?: number | string | null) => string) =>
-  h('span', { class: getLossClass(value) }, formatter(value))
-const totalQuantity = computed(() => sumQuantity(formData.value.details || [], (detail) => getDifferenceQuantity(detail)))
-const totalPrice = computed(() => sumPrice(formData.value.details || [], (detail) => getBookPrice(detail)))
-const actualPrice = computed(() => sumPrice(formData.value.details || [], (detail) => getActualPrice(detail)))
+const renderLossText = (
+  value: number | string | null | undefined,
+  formatter: (value?: number | string | null) => string
+) => h('span', { class: getLossClass(value) }, formatter(value))
+const totalQuantity = computed(() =>
+  sumQuantity(formData.value.details || [], (detail) => getDifferenceQuantity(detail))
+)
+const totalPrice = computed(() =>
+  sumPrice(formData.value.details || [], (detail) => getBookPrice(detail))
+)
+const actualPrice = computed(() =>
+  sumPrice(formData.value.details || [], (detail) => getActualPrice(detail))
+)
 const differencePrice = computed(() => roundPrice(actualPrice.value - totalPrice.value) || 0)
 const isPrepareOrder = computed(
   () =>
@@ -329,10 +372,14 @@ const getDetailSummaries = ({ columns, data }: { columns: any[]; data: CheckOrde
   columns.map((column, index) => {
     if (index === 0) return '合计'
     if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
-    if (column.property === 'checkQuantity') return formatSumQuantity(data, (detail) => detail.checkQuantity)
-    if (column.property === 'actualPrice') return formatSumPrice(data, (detail) => getActualPrice(detail))
-    if (column.property === 'differenceQuantity') return renderLossText(totalQuantity.value, formatQuantity)
-    if (column.property === 'differencePrice') return renderLossText(differencePrice.value, formatPrice)
+    if (column.property === 'checkQuantity')
+      return formatSumQuantity(data, (detail) => detail.checkQuantity)
+    if (column.property === 'actualPrice')
+      return formatSumPrice(data, (detail) => getActualPrice(detail))
+    if (column.property === 'differenceQuantity')
+      return renderLossText(totalQuantity.value, formatQuantity)
+    if (column.property === 'differencePrice')
+      return renderLossText(differencePrice.value, formatPrice)
     return ''
   })
 
@@ -357,14 +404,18 @@ const validateDetails = (required: boolean) => {
 
 /** 构建提交数据 */
 const buildSubmitData = () => {
-  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, actualPrice: _actualPrice, details, ...order } = formData.value
+  const {
+    totalQuantity: _totalQuantity,
+    totalPrice: _totalPrice,
+    actualPrice: _actualPrice,
+    details,
+    ...order
+  } = formData.value
   return {
     ...order,
-    details: (details || []).map(({
-      actualPrice: _rowActualPrice,
-      availableQuantity: _availableQuantity,
-      ...detail
-    }) => detail)
+    details: (details || []).map(
+      ({ actualPrice: _rowActualPrice, availableQuantity: _availableQuantity, ...detail }) => detail
+    )
   } as CheckOrderVO
 }
 
diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index c3b408eab..bf3e2c3b6 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -32,9 +32,13 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">账面库存</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际库存</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际金额(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+              >实际金额(元)</th
+            >
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">盈亏数</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际盈亏金额(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
+              >实际盈亏金额(元)</th
+            >
           </tr>
         </thead>
         <tbody>
@@ -145,9 +149,15 @@ interface PrintRow extends CheckOrderDetailVO {
   differencePrice?: number
 }
 
-const getDifferenceQuantity = (detail: CheckOrderDetailVO) => Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+const getDifferenceQuantity = (detail: CheckOrderDetailVO) =>
+  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
 const getActualPrice = (detail: CheckOrderDetailVO) => {
-  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+  if (
+    detail.checkQuantity === undefined ||
+    detail.checkQuantity === null ||
+    detail.price === undefined ||
+    detail.price === null
+  ) {
     return undefined
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
@@ -171,8 +181,12 @@ const printRows = computed<PrintRow[]>(() =>
     }
   })
 )
-const totalDifferenceQuantity = computed(() => sumQuantity(printRows.value, (detail) => detail.differenceQuantity))
-const totalDifferencePrice = computed(() => sumPrice(printRows.value, (detail) => detail.differencePrice))
+const totalDifferenceQuantity = computed(() =>
+  sumQuantity(printRows.value, (detail) => detail.differenceQuantity)
+)
+const totalDifferencePrice = computed(() =>
+  sumPrice(printRows.value, (detail) => detail.differencePrice)
+)
 
 /** 打印盘库单 */
 const print = async (id: number) => {
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index f22b6474e..4a543e638 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -1,12 +1,29 @@
 <!-- WMS 盘库单 -->
 <template>
   <ContentWrap>
-    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="90px">
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="90px"
+    >
       <el-form-item label="盘库单号" prop="no">
-        <el-input v-model="queryParams.no" class="!w-240px" clearable placeholder="请输入盘库单号" @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.no"
+          class="!w-240px"
+          clearable
+          placeholder="请输入盘库单号"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择单据状态">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择单据状态"
+        >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
             :key="dict.value"
@@ -127,7 +144,7 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
-        <el-popover popper-class="wms-check-order-table-setting-popover" trigger="click" width="520">
+        <el-popover popper-class="!p-12px" trigger="click" width="520">
           <template #reference>
             <el-button>
               <Icon class="mr-5px" icon="ep:setting" />
@@ -136,14 +153,24 @@
           </template>
           <el-checkbox-group
             v-model="checkedTableColumns"
-            class="wms-check-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+            class="grid grid-cols-3 gap-y-14px rounded bg-[var(--el-fill-color-light)] p-16px"
           >
-            <el-checkbox v-for="column in tableColumnOptions" :key="column.value" :label="column.value">
+            <el-checkbox
+              v-for="column in tableColumnOptions"
+              :key="column.value"
+              class="!h-28px !mr-0 [&_.el-checkbox__label]:font-600 [&_.el-checkbox__label]:text-16px"
+              :label="column.value"
+            >
               {{ column.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-popover>
-        <el-button v-hasPermi="['wms:check-order:create']" plain type="primary" @click="openForm('create')">
+        <el-button
+          v-hasPermi="['wms:check-order:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
           <Icon class="mr-5px" icon="ep:plus" />
           新增
         </el-button>
@@ -164,7 +191,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-check-order-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -176,26 +203,34 @@
             <el-table-column label="商品信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500">商品编号：{{ detail.itemCode }}</div>
+                <div v-if="detail.itemCode" class="text-12px text-gray-500"
+                  >商品编号：{{ detail.itemCode }}</div
+                >
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
+                <div v-if="detail.skuCode" class="text-12px text-gray-500"
+                  >规格编号：{{ detail.skuCode }}</div
+                >
               </template>
             </el-table-column>
             <el-table-column align="right" label="账面数量" width="120">
               <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
             </el-table-column>
             <el-table-column align="right" label="实盘数量" width="120">
-              <template #default="{ row: detail }">{{ formatQuantity(detail.checkQuantity) }}</template>
+              <template #default="{ row: detail }">{{
+                formatQuantity(detail.checkQuantity)
+              }}</template>
             </el-table-column>
             <el-table-column align="right" label="单价(元)" width="120">
               <template #default="{ row: detail }">{{ formatPrice(detail.price) }}</template>
             </el-table-column>
             <el-table-column align="right" label="实际金额(元)" width="140">
-              <template #default="{ row: detail }">{{ formatPrice(getDetailActualPrice(detail)) }}</template>
+              <template #default="{ row: detail }">{{
+                formatPrice(getDetailActualPrice(detail))
+              }}</template>
             </el-table-column>
             <el-table-column align="right" label="盈亏数量" width="120">
               <template #default="{ row: detail }">
@@ -231,20 +266,22 @@
           <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="isTableColumnVisible('warehouse')"
-        label="仓库"
-        min-width="180"
-      >
+      <el-table-column v-if="isTableColumnVisible('warehouse')" label="仓库" min-width="180">
         <template #default="{ row }">
           {{ row.warehouseName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="盈亏/金额(元)" min-width="200">
+      <el-table-column
+        v-if="isTableColumnVisible('quantityAmount')"
+        label="盈亏/金额(元)"
+        min-width="200"
+      >
         <template #default="{ row }">
           <div class="flex items-center justify-between">
             <span>盈亏数：</span>
-            <span :class="getLossClass(row.totalQuantity)">{{ formatQuantity(row.totalQuantity) }}</span>
+            <span :class="getLossClass(row.totalQuantity)">{{
+              formatQuantity(row.totalQuantity)
+            }}</span>
           </div>
           <div class="flex items-center justify-between">
             <span>总金额：</span>
@@ -256,20 +293,37 @@
           </div>
           <div class="flex items-center justify-between">
             <span>盈亏金额：</span>
-            <span :class="getLossClass(getDifferencePrice(row))">{{ formatPrice(getDifferencePrice(row)) }}</span>
+            <span :class="getLossClass(getDifferencePrice(row))">{{
+              formatPrice(getDifferencePrice(row))
+            }}</span>
           </div>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
-          <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
-          <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
+          <div
+            >创建：{{ formatNullableDate(row.createTime) }} /
+            {{ row.creatorName || row.creator || '-' }}</div
+          >
+          <div
+            >更新：{{ formatNullableDate(row.updateTime) }} /
+            {{ row.updaterName || row.updater || '-' }}</div
+          >
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column
+        v-if="isTableColumnVisible('remark')"
+        label="备注"
+        min-width="160"
+        prop="remark"
+      />
       <el-table-column align="center" fixed="right" label="操作" width="150">
         <template #default="{ row }">
-          <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
+          <el-tooltip
+            :content="getUpdateTip(row.status)"
+            :disabled="canUpdate(row.status)"
+            placement="top"
+          >
             <span>
               <el-button
                 v-hasPermi="['wms:check-order:update']"
@@ -282,7 +336,11 @@
               </el-button>
             </span>
           </el-tooltip>
-          <el-tooltip :content="getDeleteTip(row.status)" :disabled="canDelete(row.status)" placement="top">
+          <el-tooltip
+            :content="getDeleteTip(row.status)"
+            :disabled="canDelete(row.status)"
+            placement="top"
+          >
             <span>
               <el-button
                 v-hasPermi="['wms:check-order:delete']"
@@ -306,7 +364,12 @@
         </template>
       </el-table-column>
     </el-table>
-    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total" @pagination="getList" />
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <CheckOrderForm ref="formRef" @success="getList" />
@@ -320,7 +383,11 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList
+} from '@/views/wms/utils/constants'
 import {
   formatPrice,
   formatQuantity,
@@ -387,8 +454,10 @@ const queryFormRef = ref()
 const exportLoading = ref(false)
 const detailMap = reactive<Record<number, CheckOrderDetailVO[]>>({})
 
-const canUpdate = (status?: number) => status !== undefined && OrderUpdateStatusList.includes(status)
-const canDelete = (status?: number) => status !== undefined && OrderDeleteStatusList.includes(status)
+const canUpdate = (status?: number) =>
+  status !== undefined && OrderUpdateStatusList.includes(status)
+const canDelete = (status?: number) =>
+  status !== undefined && OrderDeleteStatusList.includes(status)
 const getUpdateTip = (status?: number) => {
   if (status === OrderStatusEnum.FINISHED) return '已盘库，无法修改'
   if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
@@ -398,11 +467,17 @@ const getDeleteTip = (status?: number) => {
   if (status === OrderStatusEnum.FINISHED) return '已盘库，无法删除'
   return '当前状态无法删除'
 }
-const getDifferencePrice = (row: CheckOrderVO) => roundPrice(Number(row.actualPrice || 0) - Number(row.totalPrice || 0))
+const getDifferencePrice = (row: CheckOrderVO) =>
+  roundPrice(Number(row.actualPrice || 0) - Number(row.totalPrice || 0))
 const getDetailDifferenceQuantity = (detail: CheckOrderDetailVO) =>
   Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
 const getDetailActualPrice = (detail: CheckOrderDetailVO) => {
-  if (detail.checkQuantity === undefined || detail.checkQuantity === null || detail.price === undefined || detail.price === null) {
+  if (
+    detail.checkQuantity === undefined ||
+    detail.checkQuantity === null ||
+    detail.price === undefined ||
+    detail.price === null
+  ) {
     return undefined
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
@@ -465,27 +540,3 @@ const handleExport = async () => {
 
 onMounted(() => getList())
 </script>
-
-<style scoped>
-:deep(.wms-check-order-cell) {
-  vertical-align: top;
-}
-
-:global(.wms-check-order-table-setting-popover) {
-  padding: 12px;
-}
-
-:global(.wms-check-order-table-setting) {
-  background-color: var(--el-fill-color-light);
-}
-
-:global(.wms-check-order-table-setting .el-checkbox) {
-  height: 28px;
-  margin-right: 0;
-}
-
-:global(.wms-check-order-table-setting .el-checkbox__label) {
-  font-size: 16px;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 4c83b2e95..37a0c0e74 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -50,13 +50,17 @@
         <el-table-column label="商品信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500"
+              >商品编号：{{ row.itemCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500"
+              >规格编号：{{ row.skuCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column align="right" label="数量" prop="quantity" width="120">
@@ -78,7 +82,12 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
-import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
 
 /** WMS 移库单详情 */
 defineOptions({ name: 'WmsMovementOrderDetail' })
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index bee09c6ab..717be44e9 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -1,7 +1,13 @@
 <!-- WMS 移库单表单 -->
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="98px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="98px"
+    >
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="移库单号" prop="no">
@@ -10,12 +16,18 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="来源仓库" prop="sourceWarehouseId">
-            <WarehouseSelect v-model="formData.sourceWarehouseId" @change="handleSourceWarehouseChange" />
+            <WarehouseSelect
+              v-model="formData.sourceWarehouseId"
+              @change="handleSourceWarehouseChange"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="目标仓库" prop="targetWarehouseId">
-            <WarehouseSelect v-model="formData.targetWarehouseId" @change="handleTargetWarehouseChange" />
+            <WarehouseSelect
+              v-model="formData.targetWarehouseId"
+              @change="handleTargetWarehouseChange"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -31,16 +43,31 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" maxlength="255" placeholder="请输入备注" :rows="3" type="textarea" />
+            <el-input
+              v-model="formData.remark"
+              maxlength="255"
+              placeholder="请输入备注"
+              :rows="3"
+              type="textarea"
+            />
           </el-form-item>
         </el-col>
       </el-row>
 
       <div class="mb-12px flex items-center justify-between">
         <span class="text-14px font-bold">移库明细</span>
-        <el-tooltip content="请先选择来源仓库" :disabled="!!formData.sourceWarehouseId" placement="top">
+        <el-tooltip
+          content="请先选择来源仓库"
+          :disabled="!!formData.sourceWarehouseId"
+          placement="top"
+        >
           <span>
-            <el-button :disabled="!formData.sourceWarehouseId" plain type="primary" @click="handleAddDetail">
+            <el-button
+              :disabled="!formData.sourceWarehouseId"
+              plain
+              type="primary"
+              @click="handleAddDetail"
+            >
               <Icon class="mr-5px" icon="ep:plus" />
               添加商品
             </el-button>
@@ -57,13 +84,17 @@
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500">商品编号：{{ row.itemCode }}</div>
+            <div v-if="row.itemCode" class="text-12px text-gray-500"
+              >商品编号：{{ row.itemCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500">规格编号：{{ row.skuCode }}</div>
+            <div v-if="row.skuCode" class="text-12px text-gray-500"
+              >规格编号：{{ row.skuCode }}</div
+            >
           </template>
         </el-table-column>
         <el-table-column align="right" label="可用库存" width="120">
@@ -143,7 +174,13 @@
           </el-button>
         </div>
         <div>
-          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">保存</el-button>
+          <el-button
+            v-if="isPrepareOrder"
+            :disabled="formLoading"
+            type="primary"
+            @click="submitForm"
+            >保存</el-button
+          >
           <el-button @click="dialogVisible = false">取 消</el-button>
         </div>
       </div>
@@ -155,7 +192,9 @@
 import { FormRules } from 'element-plus'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
-import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
+import InventorySelect, {
+  InventorySelectRow
+} from '@/views/wms/inventory/components/InventorySelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
@@ -201,7 +240,9 @@ const formRules = reactive<FormRules>({
 const formRef = ref()
 const inventorySelectRef = ref()
 
-const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
+const detailPriceSum = computed(() =>
+  sumPrice(formData.value.details || [], (detail) => detail.price)
+)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -273,10 +314,7 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
 /** 判断库存是否已选择 */
 const isInventorySelected = (inventory: InventorySelectRow) =>
   (formData.value.details || []).some((detail) => {
-    return (
-      detail.skuId === inventory.skuId &&
-      detail.sourceWarehouseId === inventory.warehouseId
-    )
+    return detail.skuId === inventory.skuId && detail.sourceWarehouseId === inventory.warehouseId
   })
 
 const handleDeleteDetail = (index: number) => {
@@ -358,7 +396,12 @@ const validateDetails = (required: boolean) => {
 
 /** 构建提交数据 */
 const buildSubmitData = () => {
-  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  const {
+    totalQuantity: _totalQuantity,
+    totalPrice: _totalPrice,
+    details,
+    ...order
+  } = formData.value
   return {
     ...order,
     details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 30de21b95..ff0e11e6b 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -1,12 +1,29 @@
 <!-- WMS 移库单 -->
 <template>
   <ContentWrap>
-    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="90px">
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="90px"
+    >
       <el-form-item label="移库单号" prop="no">
-        <el-input v-model="queryParams.no" class="!w-240px" clearable placeholder="请输入移库单号" @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.no"
+          class="!w-240px"
+          clearable
+          placeholder="请输入移库单号"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择单据状态">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择单据状态"
+        >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.WMS_ORDER_STATUS)"
             :key="dict.value"
@@ -111,7 +128,7 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
-        <el-popover popper-class="wms-movement-order-table-setting-popover" trigger="click" width="520">
+        <el-popover popper-class="!p-12px" trigger="click" width="520">
           <template #reference>
             <el-button>
               <Icon class="mr-5px" icon="ep:setting" />
@@ -120,14 +137,24 @@
           </template>
           <el-checkbox-group
             v-model="checkedTableColumns"
-            class="wms-movement-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+            class="grid grid-cols-3 gap-y-14px rounded bg-[var(--el-fill-color-light)] p-16px"
           >
-            <el-checkbox v-for="column in tableColumnOptions" :key="column.value" :label="column.value">
+            <el-checkbox
+              v-for="column in tableColumnOptions"
+              :key="column.value"
+              class="!h-28px !mr-0 [&_.el-checkbox__label]:font-600 [&_.el-checkbox__label]:text-16px"
+              :label="column.value"
+            >
               {{ column.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-popover>
-        <el-button v-hasPermi="['wms:movement-order:create']" plain type="primary" @click="openForm('create')">
+        <el-button
+          v-hasPermi="['wms:movement-order:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
           <Icon class="mr-5px" icon="ep:plus" />
           新增
         </el-button>
@@ -148,7 +175,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-movement-order-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -160,13 +187,17 @@
             <el-table-column label="商品信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500">商品编号：{{ detail.itemCode }}</div>
+                <div v-if="detail.itemCode" class="text-12px text-gray-500"
+                  >商品编号：{{ detail.itemCode }}</div
+                >
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500">规格编号：{{ detail.skuCode }}</div>
+                <div v-if="detail.skuCode" class="text-12px text-gray-500"
+                  >规格编号：{{ detail.skuCode }}</div
+                >
               </template>
             </el-table-column>
             <el-table-column align="right" label="移库数量" width="120">
@@ -176,7 +207,9 @@
               <template #default="{ row: detail }">{{ formatPrice(detail.price) || '-' }}</template>
             </el-table-column>
             <el-table-column align="right" label="金额(元)" width="120">
-              <template #default="{ row: detail }">{{ formatPrice(getDetailTotalPrice(detail)) || '-' }}</template>
+              <template #default="{ row: detail }">{{
+                formatPrice(getDetailTotalPrice(detail)) || '-'
+              }}</template>
             </el-table-column>
           </el-table>
         </template>
@@ -216,7 +249,11 @@
           {{ row.targetWarehouseName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('quantityAmount')" label="总数量/总金额(元)" min-width="180">
+      <el-table-column
+        v-if="isTableColumnVisible('quantityAmount')"
+        label="总数量/总金额(元)"
+        min-width="180"
+      >
         <template #default="{ row }">
           <div class="flex items-center justify-between">
             <span>数量：</span>
@@ -230,14 +267,29 @@
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
-          <div>创建：{{ formatNullableDate(row.createTime) }} / {{ row.creatorName || row.creator || '-' }}</div>
-          <div>更新：{{ formatNullableDate(row.updateTime) }} / {{ row.updaterName || row.updater || '-' }}</div>
+          <div
+            >创建：{{ formatNullableDate(row.createTime) }} /
+            {{ row.creatorName || row.creator || '-' }}</div
+          >
+          <div
+            >更新：{{ formatNullableDate(row.updateTime) }} /
+            {{ row.updaterName || row.updater || '-' }}</div
+          >
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column
+        v-if="isTableColumnVisible('remark')"
+        label="备注"
+        min-width="160"
+        prop="remark"
+      />
       <el-table-column align="center" fixed="right" label="操作" width="150">
         <template #default="{ row }">
-          <el-tooltip :content="getUpdateTip(row.status)" :disabled="canUpdate(row.status)" placement="top">
+          <el-tooltip
+            :content="getUpdateTip(row.status)"
+            :disabled="canUpdate(row.status)"
+            placement="top"
+          >
             <span>
               <el-button
                 v-hasPermi="['wms:movement-order:update']"
@@ -250,7 +302,11 @@
               </el-button>
             </span>
           </el-tooltip>
-          <el-tooltip :content="getDeleteTip(row.status)" :disabled="canDelete(row.status)" placement="top">
+          <el-tooltip
+            :content="getDeleteTip(row.status)"
+            :disabled="canDelete(row.status)"
+            placement="top"
+          >
             <span>
               <el-button
                 v-hasPermi="['wms:movement-order:delete']"
@@ -266,7 +322,12 @@
         </template>
       </el-table-column>
     </el-table>
-    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total" @pagination="getList" />
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <MovementOrderForm ref="formRef" @success="getList" />
@@ -279,8 +340,17 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
 import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList
+} from '@/views/wms/utils/constants'
+import {
+  formatPrice,
+  formatQuantity,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION
+} from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import MovementOrderDetail from './MovementOrderDetail.vue'
 import MovementOrderForm from './MovementOrderForm.vue'
@@ -346,8 +416,10 @@ const queryFormRef = ref()
 const exportLoading = ref(false)
 const detailMap = reactive<Record<number, MovementOrderDetailVO[]>>({})
 
-const canUpdate = (status?: number) => status !== undefined && OrderUpdateStatusList.includes(status)
-const canDelete = (status?: number) => status !== undefined && OrderDeleteStatusList.includes(status)
+const canUpdate = (status?: number) =>
+  status !== undefined && OrderUpdateStatusList.includes(status)
+const canDelete = (status?: number) =>
+  status !== undefined && OrderDeleteStatusList.includes(status)
 const getUpdateTip = (status?: number) => {
   if (status === OrderStatusEnum.FINISHED) return '已移库，无法修改'
   if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
@@ -413,27 +485,3 @@ const handleExport = async () => {
 
 onMounted(() => getList())
 </script>
-
-<style scoped>
-:deep(.wms-movement-order-cell) {
-  vertical-align: top;
-}
-
-:global(.wms-movement-order-table-setting-popover) {
-  padding: 12px;
-}
-
-:global(.wms-movement-order-table-setting) {
-  background-color: var(--el-fill-color-light);
-}
-
-:global(.wms-movement-order-table-setting .el-checkbox) {
-  height: 28px;
-  margin-right: 0;
-}
-
-:global(.wms-movement-order-table-setting .el-checkbox__label) {
-  font-size: 16px;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index cbf74e395..dd13313c3 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -44,11 +44,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="供应商" prop="merchantId">
-            <MerchantSelect
-              v-model="formData.merchantId"
-              placeholder="请选择供应商"
-              supplier
-            />
+            <MerchantSelect v-model="formData.merchantId" placeholder="请选择供应商" supplier />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -71,13 +67,14 @@
 
       <div class="mb-12px flex items-center justify-between">
         <span class="text-14px font-bold">入库明细</span>
-        <el-tooltip
-          content="请先选择仓库"
-          :disabled="!!formData.warehouseId"
-          placement="top"
-        >
+        <el-tooltip content="请先选择仓库" :disabled="!!formData.warehouseId" placement="top">
           <span>
-            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+            <el-button
+              :disabled="!formData.warehouseId"
+              plain
+              type="primary"
+              @click="handleAddDetail"
+            >
               <Icon class="mr-5px" icon="ep:plus" />
               添加商品
             </el-button>
@@ -177,7 +174,12 @@
           </el-button>
         </div>
         <div>
-          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">
+          <el-button
+            v-if="isPrepareOrder"
+            :disabled="formLoading"
+            type="primary"
+            @click="submitForm"
+          >
             保存
           </el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -241,7 +243,9 @@ const formRules = reactive<FormRules>({
 const formRef = ref() // 表单 Ref
 const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
 
-const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
+const detailPriceSum = computed(() =>
+  sumPrice(formData.value.details || [], (detail) => detail.price)
+)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -393,7 +397,12 @@ const validateDetails = (required: boolean) => {
 
 /** 构建提交数据 */
 const buildSubmitData = () => {
-  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  const {
+    totalQuantity: _totalQuantity,
+    totalPrice: _totalPrice,
+    details,
+    ...order
+  } = formData.value
   return {
     ...order,
     details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index e7af1d5d9..f79ebe8ea 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -80,7 +80,12 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ReceiptOrderApi, ReceiptOrderVO } from '@/api/wms/order/receipt'
 import { ReceiptOrderDetailVO } from '@/api/wms/order/receipt/detail'
-import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
 
 /** WMS 入库单打印 */
 defineOptions({ name: 'WmsReceiptOrderPrint' })
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 5dd619a11..4234ab2d7 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -117,18 +117,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建用户" prop="creator">
-        <UserSelectV2
-          v-model="queryParams.creator"
-          class="!w-240px"
-          placeholder="请选择创建用户"
-        />
+        <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
       </el-form-item>
       <el-form-item label="更新用户" prop="updater">
-        <UserSelectV2
-          v-model="queryParams.updater"
-          class="!w-240px"
-          placeholder="请选择更新用户"
-        />
+        <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
@@ -161,11 +153,7 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
-        <el-popover
-          popper-class="wms-receipt-order-table-setting-popover"
-          trigger="click"
-          width="520"
-        >
+        <el-popover popper-class="!p-12px" trigger="click" width="520">
           <template #reference>
             <el-button>
               <Icon class="mr-5px" icon="ep:setting" />
@@ -174,11 +162,12 @@
           </template>
           <el-checkbox-group
             v-model="checkedTableColumns"
-            class="wms-receipt-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+            class="grid grid-cols-3 gap-y-14px rounded bg-[var(--el-fill-color-light)] p-16px"
           >
             <el-checkbox
               v-for="column in tableColumnOptions"
               :key="column.value"
+              class="!h-28px !mr-0 [&_.el-checkbox__label]:font-600 [&_.el-checkbox__label]:text-16px"
               :label="column.value"
             >
               {{ column.label }}
@@ -212,7 +201,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-receipt-order-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -255,7 +244,12 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="290">
+      <el-table-column
+        v-if="isTableColumnVisible('no')"
+        fixed="left"
+        label="单号/业务单号"
+        width="290"
+      >
         <template #default="scope">
           <div>
             单号：
@@ -289,11 +283,7 @@
           <dict-tag :type="DICT_TYPE.WMS_RECEIPT_ORDER_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="isTableColumnVisible('warehouse')"
-        label="仓库"
-        min-width="160"
-      >
+      <el-table-column v-if="isTableColumnVisible('warehouse')" label="仓库" min-width="160">
         <template #default="scope">
           {{ scope.row.warehouseName || '-' }}
         </template>
@@ -332,7 +322,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column
+        v-if="isTableColumnVisible('remark')"
+        label="备注"
+        min-width="160"
+        prop="remark"
+      />
       <el-table-column align="center" fixed="right" label="操作" width="180">
         <template #default="scope">
           <el-tooltip
@@ -407,7 +402,12 @@ import {
   OrderStatusEnum,
   OrderUpdateStatusList
 } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION
+} from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import ReceiptOrderDetail from './ReceiptOrderDetail.vue'
 import ReceiptOrderForm from './ReceiptOrderForm.vue'
@@ -604,27 +604,3 @@ onMounted(async () => {
   await getList()
 })
 </script>
-
-<style scoped>
-:deep(.wms-receipt-order-cell) {
-  vertical-align: top;
-}
-
-:global(.wms-receipt-order-table-setting-popover) {
-  padding: 12px;
-}
-
-:global(.wms-receipt-order-table-setting) {
-  background-color: var(--el-fill-color-light);
-}
-
-:global(.wms-receipt-order-table-setting .el-checkbox) {
-  height: 28px;
-  margin-right: 0;
-}
-
-:global(.wms-receipt-order-table-setting .el-checkbox__label) {
-  font-size: 16px;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 793ab2b86..490d209b5 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -44,11 +44,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="merchantId">
-            <MerchantSelect
-              v-model="formData.merchantId"
-              placeholder="请选择客户"
-              customer
-            />
+            <MerchantSelect v-model="formData.merchantId" placeholder="请选择客户" customer />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -71,13 +67,14 @@
 
       <div class="mb-12px flex items-center justify-between">
         <span class="text-14px font-bold">出库明细</span>
-        <el-tooltip
-          content="请先选择仓库"
-          :disabled="!!formData.warehouseId"
-          placement="top"
-        >
+        <el-tooltip content="请先选择仓库" :disabled="!!formData.warehouseId" placement="top">
           <span>
-            <el-button :disabled="!formData.warehouseId" plain type="primary" @click="handleAddDetail">
+            <el-button
+              :disabled="!formData.warehouseId"
+              plain
+              type="primary"
+              @click="handleAddDetail"
+            >
               <Icon class="mr-5px" icon="ep:plus" />
               添加商品
             </el-button>
@@ -186,7 +183,12 @@
           </el-button>
         </div>
         <div>
-          <el-button v-if="isPrepareOrder" :disabled="formLoading" type="primary" @click="submitForm">
+          <el-button
+            v-if="isPrepareOrder"
+            :disabled="formLoading"
+            type="primary"
+            @click="submitForm"
+          >
             保存
           </el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -252,7 +254,9 @@ const formRules = reactive<FormRules>({
 const formRef = ref() // 表单 Ref
 const inventorySelectRef = ref() // 库存选择弹窗 Ref
 
-const detailPriceSum = computed(() => sumPrice(formData.value.details || [], (detail) => detail.price))
+const detailPriceSum = computed(() =>
+  sumPrice(formData.value.details || [], (detail) => detail.price)
+)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -334,10 +338,7 @@ const handleSelectInventory = (inventories: InventorySelectRow[]) => {
 /** 判断库存是否已选择 */
 const isInventorySelected = (inventory: InventorySelectRow) => {
   return (formData.value.details || []).some((detail) => {
-    return (
-      detail.skuId === inventory.skuId &&
-      detail.warehouseId === inventory.warehouseId
-    )
+    return detail.skuId === inventory.skuId && detail.warehouseId === inventory.warehouseId
   })
 }
 
@@ -417,7 +418,12 @@ const validateDetails = (required: boolean) => {
 
 /** 构建提交数据 */
 const buildSubmitData = () => {
-  const { totalQuantity: _totalQuantity, totalPrice: _totalPrice, details, ...order } = formData.value
+  const {
+    totalQuantity: _totalQuantity,
+    totalPrice: _totalPrice,
+    details,
+    ...order
+  } = formData.value
   return {
     ...order,
     details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index b60f12dd5..7ebd36feb 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -80,7 +80,12 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { ShipmentOrderApi, ShipmentOrderVO } from '@/api/wms/order/shipment'
 import { ShipmentOrderDetailVO } from '@/api/wms/order/shipment/detail'
-import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
 
 /** WMS 出库单打印 */
 defineOptions({ name: 'WmsShipmentOrderPrint' })
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 1b4af26f4..26be91af9 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -117,18 +117,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建用户" prop="creator">
-        <UserSelectV2
-          v-model="queryParams.creator"
-          class="!w-240px"
-          placeholder="请选择创建用户"
-        />
+        <UserSelectV2 v-model="queryParams.creator" class="!w-240px" placeholder="请选择创建用户" />
       </el-form-item>
       <el-form-item label="更新用户" prop="updater">
-        <UserSelectV2
-          v-model="queryParams.updater"
-          class="!w-240px"
-          placeholder="请选择更新用户"
-        />
+        <UserSelectV2 v-model="queryParams.updater" class="!w-240px" placeholder="请选择更新用户" />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
@@ -161,11 +153,7 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
-        <el-popover
-          popper-class="wms-shipment-order-table-setting-popover"
-          trigger="click"
-          width="520"
-        >
+        <el-popover popper-class="!p-12px" trigger="click" width="520">
           <template #reference>
             <el-button>
               <Icon class="mr-5px" icon="ep:setting" />
@@ -174,11 +162,12 @@
           </template>
           <el-checkbox-group
             v-model="checkedTableColumns"
-            class="wms-shipment-order-table-setting grid grid-cols-3 gap-y-14px rounded p-16px"
+            class="grid grid-cols-3 gap-y-14px rounded bg-[var(--el-fill-color-light)] p-16px"
           >
             <el-checkbox
               v-for="column in tableColumnOptions"
               :key="column.value"
+              class="!h-28px !mr-0 [&_.el-checkbox__label]:font-600 [&_.el-checkbox__label]:text-16px"
               :label="column.value"
             >
               {{ column.label }}
@@ -212,7 +201,7 @@
   <ContentWrap>
     <el-table
       v-loading="loading"
-      :cell-class-name="'wms-shipment-order-cell'"
+      cell-class-name="!align-top"
       :data="list"
       :show-overflow-tooltip="true"
       border
@@ -255,7 +244,12 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号/业务单号" width="290">
+      <el-table-column
+        v-if="isTableColumnVisible('no')"
+        fixed="left"
+        label="单号/业务单号"
+        width="290"
+      >
         <template #default="scope">
           <div>
             单号：
@@ -289,11 +283,7 @@
           <dict-tag :type="DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="isTableColumnVisible('warehouse')"
-        label="仓库"
-        min-width="160"
-      >
+      <el-table-column v-if="isTableColumnVisible('warehouse')" label="仓库" min-width="160">
         <template #default="scope">
           {{ scope.row.warehouseName || '-' }}
         </template>
@@ -332,7 +322,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="isTableColumnVisible('remark')" label="备注" min-width="160" prop="remark" />
+      <el-table-column
+        v-if="isTableColumnVisible('remark')"
+        label="备注"
+        min-width="160"
+        prop="remark"
+      />
       <el-table-column align="center" fixed="right" label="操作" width="180">
         <template #default="scope">
           <el-tooltip
@@ -407,7 +402,12 @@ import {
   OrderStatusEnum,
   OrderUpdateStatusList
 } from '@/views/wms/utils/constants'
-import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
+import {
+  formatPrice,
+  formatQuantity,
+  PRICE_PRECISION,
+  QUANTITY_PRECISION
+} from '@/views/wms/utils/format'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import ShipmentOrderDetail from './ShipmentOrderDetail.vue'
 import ShipmentOrderForm from './ShipmentOrderForm.vue'
@@ -604,27 +604,3 @@ onMounted(async () => {
   await getList()
 })
 </script>
-
-<style scoped>
-:deep(.wms-shipment-order-cell) {
-  vertical-align: top;
-}
-
-:global(.wms-shipment-order-table-setting-popover) {
-  padding: 12px;
-}
-
-:global(.wms-shipment-order-table-setting) {
-  background-color: var(--el-fill-color-light);
-}
-
-:global(.wms-shipment-order-table-setting .el-checkbox) {
-  height: 28px;
-  margin-right: 0;
-}
-
-:global(.wms-shipment-order-table-setting .el-checkbox__label) {
-  font-size: 16px;
-  font-weight: 600;
-}
-</style>

From e0352af8b04a725aec60de75df7584da185a49b7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 22:53:53 +0800
Subject: [PATCH 29/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/check/CheckOrderDetail.vue      | 12 ++++----
 src/views/wms/order/check/CheckOrderForm.vue  | 15 +++++-----
 src/views/wms/order/check/CheckOrderPrint.vue | 12 ++++----
 src/views/wms/order/check/index.vue           | 28 +++++++++----------
 .../order/movement/MovementOrderDetail.vue    | 12 ++++----
 .../wms/order/movement/MovementOrderForm.vue  | 15 +++++-----
 src/views/wms/order/movement/index.vue        | 28 +++++++++----------
 7 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index dbfdc3113..086a12ea9 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -57,17 +57,17 @@
         <el-table-column label="商品信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500"
-              >商品编号：{{ row.itemCode }}</div
-            >
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500"
-              >规格编号：{{ row.skuCode }}</div
-            >
+            <div v-if="row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ row.skuCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="账面数量" prop="quantity" width="120">
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 99db891cf..4067609ae 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -74,17 +74,17 @@
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500"
-              >商品编号：{{ row.itemCode }}</div
-            >
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500"
-              >规格编号：{{ row.skuCode }}</div
-            >
+            <div v-if="row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ row.skuCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="账面库存" prop="quantity" width="120">
@@ -183,8 +183,9 @@
             :disabled="formLoading"
             type="primary"
             @click="submitForm"
-            >保存</el-button
           >
+            保存
+          </el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </div>
       </div>
diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index bf3e2c3b6..425a45c30 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -32,13 +32,13 @@
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">账面库存</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">实际库存</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-              >实际金额(元)</th
-            >
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">
+              实际金额(元)
+            </th>
             <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">盈亏数</th>
-            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left"
-              >实际盈亏金额(元)</th
-            >
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">
+              实际盈亏金额(元)
+            </th>
           </tr>
         </thead>
         <tbody>
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 4a543e638..4e4350ef6 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -203,17 +203,17 @@
             <el-table-column label="商品信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500"
-                  >商品编号：{{ detail.itemCode }}</div
-                >
+                <div v-if="detail.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detail.itemCode }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500"
-                  >规格编号：{{ detail.skuCode }}</div
-                >
+                <div v-if="detail.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detail.skuCode }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column align="right" label="账面数量" width="120">
@@ -301,14 +301,14 @@
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
-          <div
-            >创建：{{ formatNullableDate(row.createTime) }} /
-            {{ row.creatorName || row.creator || '-' }}</div
-          >
-          <div
-            >更新：{{ formatNullableDate(row.updateTime) }} /
-            {{ row.updaterName || row.updater || '-' }}</div
-          >
+          <div>
+            创建：{{ formatNullableDate(row.createTime) }} /
+            {{ row.creatorName || row.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(row.updateTime) }} /
+            {{ row.updaterName || row.updater || '-' }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 37a0c0e74..320c479c2 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -50,17 +50,17 @@
         <el-table-column label="商品信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500"
-              >商品编号：{{ row.itemCode }}</div
-            >
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="200">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500"
-              >规格编号：{{ row.skuCode }}</div
-            >
+            <div v-if="row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ row.skuCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="数量" prop="quantity" width="120">
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 717be44e9..2bbe00bed 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -84,17 +84,17 @@
         <el-table-column label="商品信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.itemName || '-' }}</div>
-            <div v-if="row.itemCode" class="text-12px text-gray-500"
-              >商品编号：{{ row.itemCode }}</div
-            >
+            <div v-if="row.itemCode" class="text-12px text-gray-500">
+              商品编号：{{ row.itemCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="规格信息" min-width="210">
           <template #default="{ row }">
             <div>{{ row.skuName || '-' }}</div>
-            <div v-if="row.skuCode" class="text-12px text-gray-500"
-              >规格编号：{{ row.skuCode }}</div
-            >
+            <div v-if="row.skuCode" class="text-12px text-gray-500">
+              规格编号：{{ row.skuCode }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="可用库存" width="120">
@@ -179,8 +179,9 @@
             :disabled="formLoading"
             type="primary"
             @click="submitForm"
-            >保存</el-button
           >
+            保存
+          </el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </div>
       </div>
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index ff0e11e6b..9d54a7713 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -187,17 +187,17 @@
             <el-table-column label="商品信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500"
-                  >商品编号：{{ detail.itemCode }}</div
-                >
+                <div v-if="detail.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detail.itemCode }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
               <template #default="{ row: detail }">
                 <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500"
-                  >规格编号：{{ detail.skuCode }}</div
-                >
+                <div v-if="detail.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detail.skuCode }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column align="right" label="移库数量" width="120">
@@ -267,14 +267,14 @@
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
         <template #default="{ row }">
-          <div
-            >创建：{{ formatNullableDate(row.createTime) }} /
-            {{ row.creatorName || row.creator || '-' }}</div
-          >
-          <div
-            >更新：{{ formatNullableDate(row.updateTime) }} /
-            {{ row.updaterName || row.updater || '-' }}</div
-          >
+          <div>
+            创建：{{ formatNullableDate(row.createTime) }} /
+            {{ row.creatorName || row.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(row.updateTime) }} /
+            {{ row.updaterName || row.updater || '-' }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column

From 19db64c08acd84a48a11db4489f73fdf6260a737 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 23:04:50 +0800
Subject: [PATCH 30/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/md/item/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/md/item/index.vue b/src/views/wms/md/item/index.vue
index f87befa4d..88c3fc03b 100644
--- a/src/views/wms/md/item/index.vue
+++ b/src/views/wms/md/item/index.vue
@@ -94,9 +94,9 @@
           <el-table-column label="规格信息" min-width="180">
             <template #default="scope">
               <div class="text-14px">{{ scope.row.name }}</div>
-              <div v-if="scope.row.code" class="text-12px text-gray-500"
-                >编号：{{ scope.row.code }}</div
-              >
+              <div v-if="scope.row.code" class="text-12px text-gray-500">
+                编号：{{ scope.row.code }}
+              </div>
               <div v-if="scope.row.barCode" class="text-12px text-gray-500">
                 条码：{{ scope.row.barCode }}
               </div>

From 8252f7b068b33318e67c28899619e8a52e6b4f65 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 08:24:54 +0800
Subject: [PATCH 31/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20onlyPositiveQuantity=20=E5=8F=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BA=93=E5=AD=98=E9=9D=9E=E7=A9=BA=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventory/components/InventorySelect.vue | 2 +-
 src/views/wms/inventory/index/index.vue                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
index 457d55490..196cdd7cd 100644
--- a/src/views/wms/inventory/components/InventorySelect.vue
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -185,7 +185,7 @@ const getList = async () => {
       ...queryParams,
       type: 'warehouse',
       warehouseId: props.warehouseId,
-      minQuantity: 0.01
+      onlyPositiveQuantity: true
     }
     const data = await InventoryApi.getInventoryPage(params)
     list.value = data.list.map((inventory: InventoryVO) => ({
diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue
index cb8dca3b3..31374477b 100644
--- a/src/views/wms/inventory/index/index.vue
+++ b/src/views/wms/inventory/index/index.vue
@@ -200,7 +200,7 @@ const getList = async () => {
   try {
     const data = await InventoryApi.getInventoryPage({
       ...queryParams,
-      minQuantity: filterZero.value ? 1 : undefined
+      onlyPositiveQuantity: filterZero.value ? true : undefined
     })
     list.value = data.list.map((item: InventoryVO) => ({
       ...item,

From 7ff8cb78e1ff3fafdbe893c5b39cec74d6f05543 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 08:44:08 +0800
Subject: [PATCH 32/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=204=20=E4=B8=AA=E8=AE=A2=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=92=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/check/index.vue    | 232 ++++++++++++++++---------
 src/views/wms/order/movement/index.vue | 184 +++++++++++++-------
 src/views/wms/order/receipt/index.vue  |   7 +-
 src/views/wms/order/shipment/index.vue |   7 +-
 4 files changed, 278 insertions(+), 152 deletions(-)

diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 4e4350ef6..76fefc4eb 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -1,12 +1,13 @@
 <!-- WMS 盘库单 -->
 <template>
   <ContentWrap>
+    <!-- 搜索工作栏 -->
     <el-form
       ref="queryFormRef"
       :inline="true"
       :model="queryParams"
       class="-mb-15px"
-      label-width="90px"
+      label-width="80px"
     >
       <el-form-item label="盘库单号" prop="no">
         <el-input
@@ -188,6 +189,7 @@
     </el-form>
   </ContentWrap>
 
+  <!-- 盘库单列表 -->
   <ContentWrap>
     <el-table
       v-loading="loading"
@@ -198,51 +200,55 @@
       @expand-change="handleExpandChange"
     >
       <el-table-column type="expand" width="48">
-        <template #default="{ row }">
-          <el-table :data="detailMap[row.id] || []" border>
+        <template #default="scope">
+          <el-table :data="detailMap[scope.row.id] || []" border>
             <el-table-column label="商品信息" min-width="220">
-              <template #default="{ row: detail }">
-                <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500">
-                  商品编号：{{ detail.itemCode }}
+              <template #default="detailScope">
+                <div>{{ detailScope.row.itemName || '-' }}</div>
+                <div v-if="detailScope.row.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detailScope.row.itemCode }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
-              <template #default="{ row: detail }">
-                <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500">
-                  规格编号：{{ detail.skuCode }}
+              <template #default="detailScope">
+                <div>{{ detailScope.row.skuName || '-' }}</div>
+                <div v-if="detailScope.row.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detailScope.row.skuCode }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column align="right" label="账面数量" width="120">
-              <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
+              <template #default="detailScope">
+                {{ formatQuantity(detailScope.row.quantity) }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="实盘数量" width="120">
-              <template #default="{ row: detail }">{{
-                formatQuantity(detail.checkQuantity)
-              }}</template>
+              <template #default="detailScope">
+                {{ formatQuantity(detailScope.row.checkQuantity) }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="单价(元)" width="120">
-              <template #default="{ row: detail }">{{ formatPrice(detail.price) }}</template>
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.price) }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="实际金额(元)" width="140">
-              <template #default="{ row: detail }">{{
-                formatPrice(getDetailActualPrice(detail))
-              }}</template>
+              <template #default="detailScope">
+                {{ formatPrice(getDetailActualPrice(detailScope.row)) }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="盈亏数量" width="120">
-              <template #default="{ row: detail }">
-                <span :class="getLossClass(getDetailDifferenceQuantity(detail))">
-                  {{ formatQuantity(getDetailDifferenceQuantity(detail)) }}
+              <template #default="detailScope">
+                <span :class="getLossClass(getDetailDifferenceQuantity(detailScope.row))">
+                  {{ formatQuantity(getDetailDifferenceQuantity(detailScope.row)) }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column align="right" label="实际盈亏金额(元)" width="160">
-              <template #default="{ row: detail }">
-                <span :class="getLossClass(getDetailDifferencePrice(detail))">
-                  {{ formatPrice(getDetailDifferencePrice(detail)) }}
+              <template #default="detailScope">
+                <span :class="getLossClass(getDetailDifferencePrice(detailScope.row))">
+                  {{ formatPrice(getDetailDifferencePrice(detailScope.row)) }}
                 </span>
               </template>
             </el-table-column>
@@ -250,9 +256,11 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号" width="210">
-        <template #default="{ row }">
+        <template #default="scope">
           单号：
-          <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
+          <el-button link type="primary" @click="openDetail(scope.row.id)">
+            {{ scope.row.no }}
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column
@@ -262,13 +270,13 @@
         label="盘库状态"
         width="110"
       >
-        <template #default="{ row }">
-          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('warehouse')" label="仓库" min-width="180">
-        <template #default="{ row }">
-          {{ row.warehouseName || '-' }}
+        <template #default="scope">
+          {{ scope.row.warehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -276,38 +284,38 @@
         label="盈亏/金额(元)"
         min-width="200"
       >
-        <template #default="{ row }">
+        <template #default="scope">
           <div class="flex items-center justify-between">
             <span>盈亏数：</span>
-            <span :class="getLossClass(row.totalQuantity)">{{
-              formatQuantity(row.totalQuantity)
+            <span :class="getLossClass(scope.row.totalQuantity)">{{
+              formatQuantity(scope.row.totalQuantity)
             }}</span>
           </div>
           <div class="flex items-center justify-between">
             <span>总金额：</span>
-            <span>{{ formatPrice(row.totalPrice) }}</span>
+            <span>{{ formatPrice(scope.row.totalPrice) }}</span>
           </div>
           <div class="flex items-center justify-between">
             <span>实际金额：</span>
-            <span>{{ formatPrice(row.actualPrice) }}</span>
+            <span>{{ formatPrice(scope.row.actualPrice) }}</span>
           </div>
           <div class="flex items-center justify-between">
             <span>盈亏金额：</span>
-            <span :class="getLossClass(getDifferencePrice(row))">{{
-              formatPrice(getDifferencePrice(row))
+            <span :class="getLossClass(getDifferencePrice(scope.row))">{{
+              formatPrice(getDifferencePrice(scope.row))
             }}</span>
           </div>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
-        <template #default="{ row }">
+        <template #default="scope">
           <div>
-            创建：{{ formatNullableDate(row.createTime) }} /
-            {{ row.creatorName || row.creator || '-' }}
+            创建：{{ formatNullableDate(scope.row.createTime) }} /
+            {{ scope.row.creatorName || scope.row.creator || '-' }}
           </div>
           <div>
-            更新：{{ formatNullableDate(row.updateTime) }} /
-            {{ row.updaterName || row.updater || '-' }}
+            更新：{{ formatNullableDate(scope.row.updateTime) }} /
+            {{ scope.row.updaterName || scope.row.updater || '-' }}
           </div>
         </template>
       </el-table-column>
@@ -318,36 +326,36 @@
         prop="remark"
       />
       <el-table-column align="center" fixed="right" label="操作" width="150">
-        <template #default="{ row }">
+        <template #default="scope">
           <el-tooltip
-            :content="getUpdateTip(row.status)"
-            :disabled="canUpdate(row.status)"
+            :content="getCheckOrderUpdateTip(scope.row.status)"
+            :disabled="canUpdateCheckOrder(scope.row.status)"
             placement="top"
           >
             <span>
               <el-button
                 v-hasPermi="['wms:check-order:update']"
-                :disabled="!canUpdate(row.status)"
+                :disabled="!canUpdateCheckOrder(scope.row.status)"
                 link
                 type="primary"
-                @click="openForm('update', row.id)"
+                @click="openForm('update', scope.row.id)"
               >
                 修改
               </el-button>
             </span>
           </el-tooltip>
           <el-tooltip
-            :content="getDeleteTip(row.status)"
-            :disabled="canDelete(row.status)"
+            :content="getCheckOrderDeleteTip(scope.row.status)"
+            :disabled="canDeleteCheckOrder(scope.row.status)"
             placement="top"
           >
             <span>
               <el-button
                 v-hasPermi="['wms:check-order:delete']"
-                :disabled="!canDelete(row.status)"
+                :disabled="!canDeleteCheckOrder(scope.row.status)"
                 link
                 type="danger"
-                @click="handleDelete(row.id)"
+                @click="handleDelete(scope.row.id)"
               >
                 删除
               </el-button>
@@ -357,13 +365,14 @@
             v-hasPermi="['wms:check-order:query']"
             link
             type="primary"
-            @click="handlePrint(row.id)"
+            @click="handlePrint(scope.row.id)"
           >
             打印
           </el-button>
         </template>
       </el-table-column>
     </el-table>
+    <!-- 分页 -->
     <Pagination
       v-model:limit="queryParams.pageSize"
       v-model:page="queryParams.pageNo"
@@ -372,6 +381,7 @@
     />
   </ContentWrap>
 
+  <!-- 表单弹窗：添加/修改 -->
   <CheckOrderForm ref="formRef" @success="getList" />
   <CheckOrderDetail ref="detailRef" />
   <CheckOrderPrint ref="printRef" />
@@ -405,8 +415,8 @@ import download from '@/utils/download'
 /** WMS 盘库单 */
 defineOptions({ name: 'WmsCheckOrder' })
 
-const message = useMessage()
-const { t } = useI18n()
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
 type TableColumnKey = 'no' | 'status' | 'warehouse' | 'quantityAmount' | 'operateInfo' | 'remark'
 
@@ -428,9 +438,9 @@ const checkedTableColumns = ref<TableColumnKey[]>([
 ])
 const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
-const loading = ref(true)
-const list = ref<CheckOrderVO[]>([])
-const total = ref(0)
+const loading = ref(true) // 列表的加载中
+const list = ref<CheckOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
 const getDefaultQueryParams = () => ({
   pageNo: 1,
   pageSize: 10,
@@ -450,27 +460,50 @@ const getDefaultQueryParams = () => ({
   updateTime: undefined as string[] | undefined
 })
 const queryParams = reactive(getDefaultQueryParams())
-const queryFormRef = ref()
-const exportLoading = ref(false)
-const detailMap = reactive<Record<number, CheckOrderDetailVO[]>>({})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const detailMap = reactive<Record<number, CheckOrderDetailVO[]>>({}) // 盘库单明细数据
 
-const canUpdate = (status?: number) =>
-  status !== undefined && OrderUpdateStatusList.includes(status)
-const canDelete = (status?: number) =>
-  status !== undefined && OrderDeleteStatusList.includes(status)
-const getUpdateTip = (status?: number) => {
-  if (status === OrderStatusEnum.FINISHED) return '已盘库，无法修改'
-  if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
+/** 是否允许修改盘库单 */
+const canUpdateCheckOrder = (status?: number) => {
+  return status !== undefined && OrderUpdateStatusList.includes(status)
+}
+
+/** 是否允许删除盘库单 */
+const canDeleteCheckOrder = (status?: number) => {
+  return status !== undefined && OrderDeleteStatusList.includes(status)
+}
+
+/** 获得盘库单修改禁用提示 */
+const getCheckOrderUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已盘库，无法修改'
+  }
+  if (status === OrderStatusEnum.CANCELED) {
+    return '已作废，无法修改'
+  }
   return '当前状态无法修改'
 }
-const getDeleteTip = (status?: number) => {
-  if (status === OrderStatusEnum.FINISHED) return '已盘库，无法删除'
+
+/** 获得盘库单删除禁用提示 */
+const getCheckOrderDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已盘库，无法删除'
+  }
   return '当前状态无法删除'
 }
-const getDifferencePrice = (row: CheckOrderVO) =>
-  roundPrice(Number(row.actualPrice || 0) - Number(row.totalPrice || 0))
-const getDetailDifferenceQuantity = (detail: CheckOrderDetailVO) =>
-  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+
+/** 计算盘库单盈亏金额 */
+const getDifferencePrice = (row: CheckOrderVO) => {
+  return roundPrice(Number(row.actualPrice || 0) - Number(row.totalPrice || 0))
+}
+
+/** 计算明细盈亏数量 */
+const getDetailDifferenceQuantity = (detail: CheckOrderDetailVO) => {
+  return Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+}
+
+/** 计算明细实际金额 */
 const getDetailActualPrice = (detail: CheckOrderDetailVO) => {
   if (
     detail.checkQuantity === undefined ||
@@ -482,6 +515,8 @@ const getDetailActualPrice = (detail: CheckOrderDetailVO) => {
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
 }
+
+/** 计算明细盈亏金额 */
 const getDetailDifferencePrice = (detail: CheckOrderDetailVO) => {
   if (detail.price === undefined || detail.price === null) {
     return undefined
@@ -489,6 +524,7 @@ const getDetailDifferencePrice = (detail: CheckOrderDetailVO) => {
   return roundPrice(getDetailDifferenceQuantity(detail) * Number(detail.price))
 }
 
+/** 查询盘库单列表 */
 const getList = async () => {
   loading.value = true
   try {
@@ -499,44 +535,76 @@ const getList = async () => {
     loading.value = false
   }
 }
+
+/** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
+
+/** 重置按钮操作 */
 const resetQuery = () => {
   Object.assign(queryParams, getDefaultQueryParams())
   handleQuery()
 }
-const handleExpandChange = async (row: CheckOrderVO) => {
-  if (!row.id || detailMap[row.id]) return
+
+/** 展开明细 */
+const handleExpandChange = async (row: CheckOrderVO, expandedRows: CheckOrderVO[]) => {
+  if (!row.id || !expandedRows.some((item) => item.id === row.id)) {
+    return
+  }
+  delete detailMap[row.id]
   detailMap[row.id] = await CheckOrderApi.getCheckOrderDetailListByOrderId(row.id)
 }
 
+/** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => formRef.value.open(type, id)
-const detailRef = ref()
-const openDetail = (id: number) => detailRef.value.open(id)
-const printRef = ref()
-const handlePrint = (id: number) => printRef.value.print(id)
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
 
+/** 查看盘库单详情 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 打印盘库单 */
+const printRef = ref()
+const handlePrint = (id: number) => {
+  printRef.value.print(id)
+}
+
+/** 删除盘库单 */
 const handleDelete = async (id: number) => {
   try {
+    // 删除的二次确认
     await message.delConfirm()
+    // 发起删除
     await CheckOrderApi.deleteCheckOrder(id)
     message.success(t('common.delSuccess'))
+    // 刷新列表
     await getList()
   } catch {}
 }
+
+/** 导出按钮操作 */
 const handleExport = async () => {
   try {
+    // 导出的二次确认
     await message.exportConfirm()
+    // 发起导出
     exportLoading.value = true
     const data = await CheckOrderApi.exportCheckOrder(queryParams)
     download.excel(data, '盘库单.xls')
+  } catch {
   } finally {
     exportLoading.value = false
   }
 }
 
-onMounted(() => getList())
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
 </script>
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 9d54a7713..b74f493b3 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -1,12 +1,13 @@
 <!-- WMS 移库单 -->
 <template>
   <ContentWrap>
+    <!-- 搜索工作栏 -->
     <el-form
       ref="queryFormRef"
       :inline="true"
       :model="queryParams"
       class="-mb-15px"
-      label-width="90px"
+      label-width="80px"
     >
       <el-form-item label="移库单号" prop="no">
         <el-input
@@ -172,6 +173,7 @@
     </el-form>
   </ContentWrap>
 
+  <!-- 移库单列表 -->
   <ContentWrap>
     <el-table
       v-loading="loading"
@@ -182,42 +184,48 @@
       @expand-change="handleExpandChange"
     >
       <el-table-column type="expand" width="48">
-        <template #default="{ row }">
-          <el-table :data="detailMap[row.id] || []" border>
+        <template #default="scope">
+          <el-table :data="detailMap[scope.row.id] || []" border>
             <el-table-column label="商品信息" min-width="220">
-              <template #default="{ row: detail }">
-                <div>{{ detail.itemName || '-' }}</div>
-                <div v-if="detail.itemCode" class="text-12px text-gray-500">
-                  商品编号：{{ detail.itemCode }}
+              <template #default="detailScope">
+                <div>{{ detailScope.row.itemName || '-' }}</div>
+                <div v-if="detailScope.row.itemCode" class="text-12px text-gray-500">
+                  商品编号：{{ detailScope.row.itemCode }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="规格信息" min-width="220">
-              <template #default="{ row: detail }">
-                <div>{{ detail.skuName || '-' }}</div>
-                <div v-if="detail.skuCode" class="text-12px text-gray-500">
-                  规格编号：{{ detail.skuCode }}
+              <template #default="detailScope">
+                <div>{{ detailScope.row.skuName || '-' }}</div>
+                <div v-if="detailScope.row.skuCode" class="text-12px text-gray-500">
+                  规格编号：{{ detailScope.row.skuCode }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column align="right" label="移库数量" width="120">
-              <template #default="{ row: detail }">{{ formatQuantity(detail.quantity) }}</template>
+              <template #default="detailScope">
+                {{ formatQuantity(detailScope.row.quantity) }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="单价(元)" width="120">
-              <template #default="{ row: detail }">{{ formatPrice(detail.price) || '-' }}</template>
+              <template #default="detailScope">
+                {{ formatPrice(detailScope.row.price) || '-' }}
+              </template>
             </el-table-column>
             <el-table-column align="right" label="金额(元)" width="120">
-              <template #default="{ row: detail }">{{
-                formatPrice(getDetailTotalPrice(detail)) || '-'
-              }}</template>
+              <template #default="detailScope">
+                {{ formatPrice(getDetailTotalPrice(detailScope.row)) || '-' }}
+              </template>
             </el-table-column>
           </el-table>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('no')" fixed="left" label="单号" width="210">
-        <template #default="{ row }">
+        <template #default="scope">
           单号：
-          <el-button link type="primary" @click="openDetail(row.id)">{{ row.no }}</el-button>
+          <el-button link type="primary" @click="openDetail(scope.row.id)">
+            {{ scope.row.no }}
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column
@@ -227,8 +235,8 @@
         label="移库状态"
         width="110"
       >
-        <template #default="{ row }">
-          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="row.status" />
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.WMS_ORDER_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column
@@ -236,8 +244,8 @@
         label="来源仓库"
         min-width="180"
       >
-        <template #default="{ row }">
-          {{ row.sourceWarehouseName || '-' }}
+        <template #default="scope">
+          {{ scope.row.sourceWarehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -245,8 +253,8 @@
         label="目标仓库"
         min-width="180"
       >
-        <template #default="{ row }">
-          {{ row.targetWarehouseName || '-' }}
+        <template #default="scope">
+          {{ scope.row.targetWarehouseName || '-' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -254,26 +262,26 @@
         label="总数量/总金额(元)"
         min-width="180"
       >
-        <template #default="{ row }">
+        <template #default="scope">
           <div class="flex items-center justify-between">
             <span>数量：</span>
-            <span>{{ formatQuantity(row.totalQuantity) }}</span>
+            <span>{{ formatQuantity(scope.row.totalQuantity) }}</span>
           </div>
           <div class="flex items-center justify-between">
             <span>金额：</span>
-            <span>{{ formatPrice(row.totalPrice) }}</span>
+            <span>{{ formatPrice(scope.row.totalPrice) }}</span>
           </div>
         </template>
       </el-table-column>
       <el-table-column v-if="isTableColumnVisible('operateInfo')" label="操作信息" min-width="280">
-        <template #default="{ row }">
+        <template #default="scope">
           <div>
-            创建：{{ formatNullableDate(row.createTime) }} /
-            {{ row.creatorName || row.creator || '-' }}
+            创建：{{ formatNullableDate(scope.row.createTime) }} /
+            {{ scope.row.creatorName || scope.row.creator || '-' }}
           </div>
           <div>
-            更新：{{ formatNullableDate(row.updateTime) }} /
-            {{ row.updaterName || row.updater || '-' }}
+            更新：{{ formatNullableDate(scope.row.updateTime) }} /
+            {{ scope.row.updaterName || scope.row.updater || '-' }}
           </div>
         </template>
       </el-table-column>
@@ -284,36 +292,36 @@
         prop="remark"
       />
       <el-table-column align="center" fixed="right" label="操作" width="150">
-        <template #default="{ row }">
+        <template #default="scope">
           <el-tooltip
-            :content="getUpdateTip(row.status)"
-            :disabled="canUpdate(row.status)"
+            :content="getMovementOrderUpdateTip(scope.row.status)"
+            :disabled="canUpdateMovementOrder(scope.row.status)"
             placement="top"
           >
             <span>
               <el-button
                 v-hasPermi="['wms:movement-order:update']"
-                :disabled="!canUpdate(row.status)"
+                :disabled="!canUpdateMovementOrder(scope.row.status)"
                 link
                 type="primary"
-                @click="openForm('update', row.id)"
+                @click="openForm('update', scope.row.id)"
               >
                 修改
               </el-button>
             </span>
           </el-tooltip>
           <el-tooltip
-            :content="getDeleteTip(row.status)"
-            :disabled="canDelete(row.status)"
+            :content="getMovementOrderDeleteTip(scope.row.status)"
+            :disabled="canDeleteMovementOrder(scope.row.status)"
             placement="top"
           >
             <span>
               <el-button
                 v-hasPermi="['wms:movement-order:delete']"
-                :disabled="!canDelete(row.status)"
+                :disabled="!canDeleteMovementOrder(scope.row.status)"
                 link
                 type="danger"
-                @click="handleDelete(row.id)"
+                @click="handleDelete(scope.row.id)"
               >
                 删除
               </el-button>
@@ -322,6 +330,7 @@
         </template>
       </el-table-column>
     </el-table>
+    <!-- 分页 -->
     <Pagination
       v-model:limit="queryParams.pageSize"
       v-model:page="queryParams.pageNo"
@@ -330,6 +339,7 @@
     />
   </ContentWrap>
 
+  <!-- 表单弹窗：添加/修改 -->
   <MovementOrderForm ref="formRef" @success="getList" />
   <MovementOrderDetail ref="detailRef" />
 </template>
@@ -359,8 +369,8 @@ import download from '@/utils/download'
 /** WMS 移库单 */
 defineOptions({ name: 'WmsMovementOrder' })
 
-const message = useMessage()
-const { t } = useI18n()
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
 type TableColumnKey =
   | 'no'
@@ -391,9 +401,9 @@ const checkedTableColumns = ref<TableColumnKey[]>([
 ])
 const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
-const loading = ref(true)
-const list = ref<MovementOrderVO[]>([])
-const total = ref(0)
+const loading = ref(true) // 列表的加载中
+const list = ref<MovementOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
 const getDefaultQueryParams = () => ({
   pageNo: 1,
   pageSize: 10,
@@ -412,24 +422,40 @@ const getDefaultQueryParams = () => ({
   updateTime: undefined as string[] | undefined
 })
 const queryParams = reactive(getDefaultQueryParams())
-const queryFormRef = ref()
-const exportLoading = ref(false)
-const detailMap = reactive<Record<number, MovementOrderDetailVO[]>>({})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const detailMap = reactive<Record<number, MovementOrderDetailVO[]>>({}) // 移库单明细数据
 
-const canUpdate = (status?: number) =>
-  status !== undefined && OrderUpdateStatusList.includes(status)
-const canDelete = (status?: number) =>
-  status !== undefined && OrderDeleteStatusList.includes(status)
-const getUpdateTip = (status?: number) => {
-  if (status === OrderStatusEnum.FINISHED) return '已移库，无法修改'
-  if (status === OrderStatusEnum.CANCELED) return '已作废，无法修改'
+/** 是否允许修改移库单 */
+const canUpdateMovementOrder = (status?: number) => {
+  return status !== undefined && OrderUpdateStatusList.includes(status)
+}
+
+/** 是否允许删除移库单 */
+const canDeleteMovementOrder = (status?: number) => {
+  return status !== undefined && OrderDeleteStatusList.includes(status)
+}
+
+/** 获得移库单修改禁用提示 */
+const getMovementOrderUpdateTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已移库，无法修改'
+  }
+  if (status === OrderStatusEnum.CANCELED) {
+    return '已作废，无法修改'
+  }
   return '当前状态无法修改'
 }
-const getDeleteTip = (status?: number) => {
-  if (status === OrderStatusEnum.FINISHED) return '已移库，无法删除'
+
+/** 获得移库单删除禁用提示 */
+const getMovementOrderDeleteTip = (status?: number) => {
+  if (status === OrderStatusEnum.FINISHED) {
+    return '已移库，无法删除'
+  }
   return '当前状态无法删除'
 }
 
+/** 查询移库单列表 */
 const getList = async () => {
   loading.value = true
   try {
@@ -440,48 +466,78 @@ const getList = async () => {
     loading.value = false
   }
 }
+
+/** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
+
+/** 重置按钮操作 */
 const resetQuery = () => {
   Object.assign(queryParams, getDefaultQueryParams())
   handleQuery()
 }
+
+/** 计算明细金额 */
 const getDetailTotalPrice = (detail: MovementOrderDetailVO) => {
   if (!detail.quantity || detail.price === undefined || detail.price === null) {
     return undefined
   }
   return Number(detail.quantity) * Number(detail.price)
 }
-const handleExpandChange = async (row: MovementOrderVO) => {
-  if (!row.id || detailMap[row.id]) return
+
+/** 展开明细 */
+const handleExpandChange = async (row: MovementOrderVO, expandedRows: MovementOrderVO[]) => {
+  if (!row.id || !expandedRows.some((item) => item.id === row.id)) {
+    return
+  }
+  delete detailMap[row.id]
   detailMap[row.id] = await MovementOrderApi.getMovementOrderDetailListByOrderId(row.id)
 }
 
+/** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => formRef.value.open(type, id)
-const detailRef = ref()
-const openDetail = (id: number) => detailRef.value.open(id)
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
 
+/** 查看移库单详情 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 删除移库单 */
 const handleDelete = async (id: number) => {
   try {
+    // 删除的二次确认
     await message.delConfirm()
+    // 发起删除
     await MovementOrderApi.deleteMovementOrder(id)
     message.success(t('common.delSuccess'))
+    // 刷新列表
     await getList()
   } catch {}
 }
+
+/** 导出按钮操作 */
 const handleExport = async () => {
   try {
+    // 导出的二次确认
     await message.exportConfirm()
+    // 发起导出
     exportLoading.value = true
     const data = await MovementOrderApi.exportMovementOrder(queryParams)
     download.excel(data, '移库单.xls')
+  } catch {
   } finally {
     exportLoading.value = false
   }
 }
 
-onMounted(() => getList())
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+})
 </script>
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 4234ab2d7..91b9420e0 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -477,7 +477,7 @@ const getDefaultQueryParams = () => ({
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细缓存
+const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细数据
 
 /** 是否允许修改入库单 */
 const canUpdateReceiptOrder = (status?: number) => {
@@ -546,10 +546,11 @@ const getDetailTotalPrice = (detail: ReceiptOrderDetailVO) => {
 }
 
 /** 展开明细 */
-const handleExpandChange = async (row: ReceiptOrderVO) => {
-  if (!row.id || detailMap[row.id]) {
+const handleExpandChange = async (row: ReceiptOrderVO, expandedRows: ReceiptOrderVO[]) => {
+  if (!row.id || !expandedRows.some((item) => item.id === row.id)) {
     return
   }
+  delete detailMap[row.id]
   detailMap[row.id] = await ReceiptOrderApi.getReceiptOrderDetailListByOrderId(row.id)
 }
 
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 26be91af9..1adccf376 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -477,7 +477,7 @@ const getDefaultQueryParams = () => ({
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-const detailMap = reactive<Record<number, ShipmentOrderDetailVO[]>>({}) // 出库单明细缓存
+const detailMap = reactive<Record<number, ShipmentOrderDetailVO[]>>({}) // 出库单明细数据
 
 /** 是否允许修改出库单 */
 const canUpdateShipmentOrder = (status?: number) => {
@@ -546,10 +546,11 @@ const getDetailTotalPrice = (detail: ShipmentOrderDetailVO) => {
 }
 
 /** 展开明细 */
-const handleExpandChange = async (row: ShipmentOrderVO) => {
-  if (!row.id || detailMap[row.id]) {
+const handleExpandChange = async (row: ShipmentOrderVO, expandedRows: ShipmentOrderVO[]) => {
+  if (!row.id || !expandedRows.some((item) => item.id === row.id)) {
     return
   }
+  delete detailMap[row.id]
   detailMap[row.id] = await ShipmentOrderApi.getShipmentOrderDetailListByOrderId(row.id)
 }
 

From 7bae330828ac9c2de4151f4c4281127ab3f04f9d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 09:06:59 +0800
Subject: [PATCH 33/46] =?UTF-8?q?fix(wms):=20=E7=A7=BB=E5=BA=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E6=97=B6=EF=BC=8C=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E4=BB=93=E5=BA=93=E9=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/movement/MovementOrderForm.vue    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 2bbe00bed..377799cce 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -57,13 +57,13 @@
       <div class="mb-12px flex items-center justify-between">
         <span class="text-14px font-bold">移库明细</span>
         <el-tooltip
-          content="请先选择来源仓库"
-          :disabled="!!formData.sourceWarehouseId"
+          content="请先选择来源仓库和目标仓库"
+          :disabled="canAddDetail"
           placement="top"
         >
           <span>
             <el-button
-              :disabled="!formData.sourceWarehouseId"
+              :disabled="!canAddDetail"
               plain
               type="primary"
               @click="handleAddDetail"
@@ -255,6 +255,9 @@ const isSavedPrepareOrder = computed(
     formData.value.status !== undefined &&
     OrderUpdateStatusList.includes(formData.value.status)
 )
+const canAddDetail = computed(
+  () => !!formData.value.sourceWarehouseId && !!formData.value.targetWarehouseId
+)
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -300,7 +303,13 @@ const normalizeDetails = (details: MovementOrderDetailVO[]) =>
     totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 
-const handleAddDetail = () => inventorySelectRef.value?.open()
+/** 打开库存选择弹窗 */
+const handleAddDetail = () => {
+  if (!canAddDetail.value) {
+    return
+  }
+  inventorySelectRef.value?.open()
+}
 
 /** 选择库存 */
 const handleSelectInventory = (inventories: InventorySelectRow[]) => {

From 5f944548a3df8f31da7eb0499fcc403f7039a8d0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 09:46:40 +0800
Subject: [PATCH 34/46] =?UTF-8?q?fix(wms):=20=E8=B0=83=E6=95=B4=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E7=9A=84=E6=9C=80=E6=96=B0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts
index aa18ca302..9243771ac 100644
--- a/src/api/wms/inventory/index.ts
+++ b/src/api/wms/inventory/index.ts
@@ -22,5 +22,10 @@ export const InventoryApi = {
   // 查询库存统计分页
   getInventoryPage: async (params: any) => {
     return await request.get({ url: '/wms/inventory/page', params })
+  },
+
+  // 查询指定仓库的库存统计列表
+  getInventoryListByWarehouseId: async (warehouseId: number) => {
+    return await request.get({ url: '/wms/inventory/list-by-warehouse-id', params: { warehouseId } })
   }
 }

From d128df618ea998908febcb667dd2caab71d81353 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 10:22:37 +0800
Subject: [PATCH 35/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20code=20=E5=AD=97=E6=AE=B5=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=88=E4=BB=8E=E5=90=8E=E7=AB=AF=E5=88=B0=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=89=EF=BC=8C=E7=94=A8=E6=88=B7=E6=9B=B4=E5=8F=AF?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/item/brand/index.ts            |  1 +
 src/api/wms/md/item/category/index.ts         |  1 +
 src/views/wms/md/item/ItemForm.vue            | 24 ++++++++--
 src/views/wms/md/item/brand/ItemBrandForm.vue | 11 +++++
 src/views/wms/md/item/brand/index.vue         | 11 +++++
 .../wms/md/item/category/ItemCategoryForm.vue | 12 ++++-
 src/views/wms/md/item/category/index.vue      | 11 +++++
 .../md/item/sku/components/ItemSkuSelect.vue  | 46 +++++++++++++++++--
 src/views/wms/md/merchant/MerchantForm.vue    |  7 ++-
 src/views/wms/md/warehouse/WarehouseForm.vue  |  7 ++-
 src/views/wms/utils/constants.ts              | 21 +++++++++
 11 files changed, 141 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/md/item/brand/index.ts b/src/api/wms/md/item/brand/index.ts
index e54d62c18..01e2b4c1c 100644
--- a/src/api/wms/md/item/brand/index.ts
+++ b/src/api/wms/md/item/brand/index.ts
@@ -3,6 +3,7 @@ import request from '@/config/axios'
 // WMS 商品品牌 VO
 export interface ItemBrandVO {
   id?: number
+  code?: string
   name?: string
   createTime?: Date
 }
diff --git a/src/api/wms/md/item/category/index.ts b/src/api/wms/md/item/category/index.ts
index 98c66312d..bc654a252 100644
--- a/src/api/wms/md/item/category/index.ts
+++ b/src/api/wms/md/item/category/index.ts
@@ -4,6 +4,7 @@ import request from '@/config/axios'
 export interface ItemCategoryVO {
   id?: number
   parentId?: number
+  code?: string
   name?: string
   sort?: number
   status?: number
diff --git a/src/views/wms/md/item/ItemForm.vue b/src/views/wms/md/item/ItemForm.vue
index 79b78d646..81856fa3e 100644
--- a/src/views/wms/md/item/ItemForm.vue
+++ b/src/views/wms/md/item/ItemForm.vue
@@ -22,7 +22,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="商品编号" prop="code">
-            <el-input v-model="formData.code" maxlength="20" placeholder="请输入商品编号" />
+            <el-input v-model="formData.code" maxlength="20" placeholder="请输入商品编号">
+              <template #append>
+                <el-button @click="formData.code = generateWmsCode('I')">生成</el-button>
+              </template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -68,15 +72,23 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="编号/条码" width="220">
+        <el-table-column label="编号/条码" width="260">
           <template #default="scope">
-            <el-input v-model="scope.row.code" maxlength="64" class="!w-1/1" placeholder="编号" />
+            <el-input v-model="scope.row.code" maxlength="64" class="!w-1/1" placeholder="编号">
+              <template #append>
+                <el-button @click="scope.row.code = generateWmsCode('S')">生成</el-button>
+              </template>
+            </el-input>
             <el-input
               v-model="scope.row.barCode"
               maxlength="64"
               class="!w-1/1 mt-5px"
-              placeholder="条码为空时，提交后自动生成"
-            />
+              placeholder="条码"
+            >
+              <template #append>
+                <el-button @click="scope.row.barCode = generateWmsCode()">生成</el-button>
+              </template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="长/宽/高(cm)" width="210">
@@ -168,6 +180,7 @@ import { FormRules } from 'element-plus'
 import { ItemApi, ItemVO } from '@/api/wms/md/item'
 import { ItemSkuVO } from '@/api/wms/md/item/sku'
 import { DIMENSION_PRECISION, PRICE_PRECISION, WEIGHT_PRECISION } from '@/views/wms/utils/format'
+import { generateWmsCode } from '@/views/wms/utils/constants'
 import ItemBrandSelect from './brand/components/ItemBrandSelect.vue'
 import ItemCategorySelect from './category/components/ItemCategorySelect.vue'
 
@@ -192,6 +205,7 @@ const formData = ref<ItemVO>({
   skus: []
 })
 const formRules = reactive<FormRules>({
+  code: [{ required: true, message: '商品编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
   categoryId: [{ required: true, message: '商品分类不能为空', trigger: 'change' }],
   skus: [{ required: true, message: '至少包含一个商品规格', trigger: 'change' }]
diff --git a/src/views/wms/md/item/brand/ItemBrandForm.vue b/src/views/wms/md/item/brand/ItemBrandForm.vue
index 0187e54e4..ef97abafc 100644
--- a/src/views/wms/md/item/brand/ItemBrandForm.vue
+++ b/src/views/wms/md/item/brand/ItemBrandForm.vue
@@ -8,6 +8,13 @@
       :rules="formRules"
       label-width="100px"
     >
+      <el-form-item label="品牌编号" prop="code">
+        <el-input v-model="formData.code" maxlength="20" placeholder="请输入品牌编号">
+          <template #append>
+            <el-button @click="formData.code = generateWmsCode('B')">生成</el-button>
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item label="品牌名称" prop="name">
         <el-input v-model="formData.name" maxlength="30" placeholder="请输入品牌名称" />
       </el-form-item>
@@ -21,6 +28,7 @@
 
 <script lang="ts" setup>
 import { ItemBrandApi, ItemBrandVO } from '@/api/wms/md/item/brand'
+import { generateWmsCode } from '@/views/wms/utils/constants'
 
 /** WMS 商品品牌表单 */
 defineOptions({ name: 'WmsItemBrandForm' })
@@ -34,9 +42,11 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<ItemBrandVO>({
   id: undefined,
+  code: undefined,
   name: undefined
 })
 const formRules = reactive({
+  code: [{ required: true, message: '品牌编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '品牌名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -87,6 +97,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
+    code: undefined,
     name: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/wms/md/item/brand/index.vue b/src/views/wms/md/item/brand/index.vue
index ab342d1ba..3cf4f626b 100644
--- a/src/views/wms/md/item/brand/index.vue
+++ b/src/views/wms/md/item/brand/index.vue
@@ -9,6 +9,15 @@
       class="-mb-15px"
       label-width="68px"
     >
+      <el-form-item label="品牌编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入品牌编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="品牌名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -53,6 +62,7 @@
   <!-- 品牌列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="品牌编号" prop="code" width="160" />
       <el-table-column align="center" label="品牌名称" prop="name" />
       <el-table-column
         :formatter="dateFormatter"
@@ -113,6 +123,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  code: undefined,
   name: undefined
 })
 const queryFormRef = ref() // 搜索的表单
diff --git a/src/views/wms/md/item/category/ItemCategoryForm.vue b/src/views/wms/md/item/category/ItemCategoryForm.vue
index 030ab7ea1..fcbfaa052 100644
--- a/src/views/wms/md/item/category/ItemCategoryForm.vue
+++ b/src/views/wms/md/item/category/ItemCategoryForm.vue
@@ -16,9 +16,15 @@
           check-strictly
           default-expand-all
           placeholder="请选择上级分类"
-          value-key="categoryId"
         />
       </el-form-item>
+      <el-form-item label="分类编号" prop="code">
+        <el-input v-model="formData.code" maxlength="20" placeholder="请输入分类编号">
+          <template #append>
+            <el-button @click="formData.code = generateWmsCode('C')">生成</el-button>
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入分类名称" />
       </el-form-item>
@@ -53,6 +59,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import { CommonStatusEnum } from '@/utils/constants'
 import { FormRules } from 'element-plus'
 import { ItemCategoryApi, ItemCategoryVO } from '@/api/wms/md/item/category'
+import { generateWmsCode } from '@/views/wms/utils/constants'
 
 /** WMS 商品分类表单 */
 defineOptions({ name: 'WmsItemCategoryForm' })
@@ -67,12 +74,14 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<ItemCategoryVO>({
   id: undefined,
   parentId: undefined,
+  code: undefined,
   name: undefined,
   sort: 0,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive<FormRules>({
   parentId: [{ required: true, message: '上级分类不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '分类编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
@@ -140,6 +149,7 @@ const resetForm = (parentId?: number) => {
   formData.value = {
     id: undefined,
     parentId,
+    code: undefined,
     name: undefined,
     sort: 0,
     status: CommonStatusEnum.ENABLE
diff --git a/src/views/wms/md/item/category/index.vue b/src/views/wms/md/item/category/index.vue
index c62ef651c..9bc9bd4ec 100644
--- a/src/views/wms/md/item/category/index.vue
+++ b/src/views/wms/md/item/category/index.vue
@@ -9,6 +9,15 @@
       class="-mb-15px"
       label-width="68px"
     >
+      <el-form-item label="分类编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入分类编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="分类名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -71,6 +80,7 @@
       row-key="id"
     >
       <el-table-column label="分类名称" prop="name" />
+      <el-table-column align="center" label="分类编号" prop="code" width="160" />
       <el-table-column align="center" label="排序" prop="sort" width="120" />
       <el-table-column align="center" label="状态" prop="status" width="120">
         <template #default="scope">
@@ -137,6 +147,7 @@ const list = ref<ItemCategoryVO[]>([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 100,
+  code: undefined,
   name: undefined,
   status: undefined
 })
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
index 06e03e3c5..793ea5d2d 100644
--- a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -162,6 +162,9 @@ const selectedList = ref<ItemSkuVO[]>([]) // 已选择 SKU 列表
 const selectedMap = ref<Map<number, ItemSkuVO>>(new Map()) // 跨页已选择 SKU
 const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 SKU 编号
 const disabledSelectedIds = ref<Set<number>>(new Set()) // 已在业务明细中使用的 SKU 编号
+const multiple = ref(true) // 是否允许多选
+const preselectDisabled = ref(true) // 是否回显已禁用的 SKU
+const syncingSingleSelection = ref(false) // 单选模式同步表格勾选状态中
 const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
 const queryFormRef = ref() // 搜索的表单
 const getDefaultQueryParams = () => ({
@@ -179,8 +182,13 @@ const emit = defineEmits<{
 }>()
 
 /** 打开弹窗 */
-const open = async (selectedIds?: number[]) => {
+const open = async (
+  selectedIds?: number[],
+  options?: { multiple?: boolean; preselectDisabled?: boolean }
+) => {
   dialogVisible.value = true
+  multiple.value = options?.multiple ?? true
+  preselectDisabled.value = options?.preselectDisabled ?? true
   Object.assign(queryParams, getDefaultQueryParams())
   selectedList.value = []
   selectedMap.value = new Map()
@@ -219,7 +227,7 @@ const loadSkuList = async () => {
 
 /** 初始化已选 SKU */
 const initSelectedList = () => {
-  if (preSelectedIds.value.length === 0) {
+  if (!preselectDisabled.value || preSelectedIds.value.length === 0) {
     return
   }
   allList.value.forEach((sku) => {
@@ -286,7 +294,34 @@ const isRowSelectable = (row: ItemSkuVO) => {
 }
 
 /** 选择变化 */
-const handleSelectionChange = (rows: ItemSkuVO[]) => {
+const handleSelectionChange = async (rows: ItemSkuVO[]) => {
+  if (syncingSingleSelection.value) {
+    return
+  }
+  if (!multiple.value) {
+    let row: ItemSkuVO | undefined
+    for (let i = rows.length - 1; i >= 0; i--) {
+      const item = rows[i]
+      if (item.id && !disabledSelectedIds.value.has(item.id)) {
+        row = item
+        break
+      }
+    }
+    selectedMap.value = new Map()
+    if (row?.id) {
+      selectedMap.value.set(row.id, row)
+    }
+    selectedList.value = Array.from(selectedMap.value.values())
+    syncingSingleSelection.value = true
+    await nextTick()
+    tableRef.value?.clearSelection()
+    if (row) {
+      tableRef.value?.toggleRowSelection(row, true)
+    }
+    await nextTick()
+    syncingSingleSelection.value = false
+    return
+  }
   const currentPageIds = list.value.map((row) => row.id).filter((id): id is number => !!id)
   currentPageIds.forEach((id) => {
     if (!disabledSelectedIds.value.has(id)) {
@@ -306,6 +341,11 @@ const handleRowDblClick = (row: ItemSkuVO) => {
   if (row.id && disabledSelectedIds.value.has(row.id)) {
     return
   }
+  if (!multiple.value) {
+    emit('change', [row])
+    dialogVisible.value = false
+    return
+  }
   tableRef.value?.toggleRowSelection(row)
 }
 
diff --git a/src/views/wms/md/merchant/MerchantForm.vue b/src/views/wms/md/merchant/MerchantForm.vue
index 6571f0066..b111eb900 100644
--- a/src/views/wms/md/merchant/MerchantForm.vue
+++ b/src/views/wms/md/merchant/MerchantForm.vue
@@ -11,7 +11,11 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="往来企业编号" prop="code">
-            <el-input v-model="formData.code" maxlength="20" placeholder="请输入往来企业编号" />
+            <el-input v-model="formData.code" maxlength="20" placeholder="请输入往来企业编号">
+              <template #append>
+                <el-button @click="formData.code = generateWmsCode('M')">生成</el-button>
+              </template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -88,6 +92,7 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { MerchantApi, MerchantVO } from '@/api/wms/md/merchant'
+import { generateWmsCode } from '@/views/wms/utils/constants'
 
 /** WMS 往来企业表单 */
 defineOptions({ name: 'WmsMerchantForm' })
diff --git a/src/views/wms/md/warehouse/WarehouseForm.vue b/src/views/wms/md/warehouse/WarehouseForm.vue
index 0d3f6e423..850d4229c 100644
--- a/src/views/wms/md/warehouse/WarehouseForm.vue
+++ b/src/views/wms/md/warehouse/WarehouseForm.vue
@@ -12,7 +12,11 @@
         <el-input v-model="formData.name" maxlength="50" placeholder="请输入仓库名称" />
       </el-form-item>
       <el-form-item label="仓库编号" prop="code">
-        <el-input v-model="formData.code" maxlength="20" placeholder="请输入仓库编号" />
+        <el-input v-model="formData.code" maxlength="20" placeholder="请输入仓库编号">
+          <template #append>
+            <el-button @click="formData.code = generateWmsCode('W')">生成</el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
         <el-input-number
@@ -40,6 +44,7 @@
 
 <script lang="ts" setup>
 import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
+import { generateWmsCode } from '@/views/wms/utils/constants'
 
 /** WMS 仓库表单 */
 defineOptions({ name: 'WmsWarehouseForm' })
diff --git a/src/views/wms/utils/constants.ts b/src/views/wms/utils/constants.ts
index 3a2baf0c7..771080aaa 100644
--- a/src/views/wms/utils/constants.ts
+++ b/src/views/wms/utils/constants.ts
@@ -29,3 +29,24 @@ export const CustomerMerchantTypeList = [
   MerchantTypeEnum.CUSTOMER,
   MerchantTypeEnum.CUSTOMER_SUPPLIER
 ]
+
+/**
+ * 生成 WMS 编号 / 条码。
+ *
+ * @param prefix 可选前缀，按业务域区分编号种类：
+ *   - `I` 商品编号
+ *   - `S` SKU 编号
+ *   - `W` 仓库编号
+ *   - `M` 往来企业编号
+ *   - 不传 / 空串 用于 SKU 条码（条码业务习惯纯数字）
+ * @returns 前缀 + 8 位随机数字串。
+ *
+ * 由前端在表单【生成】按钮上调用，避免后端兜底生成造成编号不可控。
+ */
+export const generateWmsCode = (prefix: string = ''): string => {
+  let result = ''
+  for (let i = 0; i < 8; i++) {
+    result += Math.floor(Math.random() * 10).toString()
+  }
+  return prefix + result
+}

From 52972506a8e5a622a10567059b19cf8bedb403d8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 10:45:28 +0800
Subject: [PATCH 36/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/index.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts
index 9243771ac..6cddf4617 100644
--- a/src/api/wms/inventory/index.ts
+++ b/src/api/wms/inventory/index.ts
@@ -17,6 +17,11 @@ export interface InventoryVO {
   createTime?: Date
 }
 
+// WMS 库存统计列表 Request VO
+export interface InventoryListReqVO {
+  warehouseId: number
+}
+
 // WMS 库存统计 API
 export const InventoryApi = {
   // 查询库存统计分页
@@ -24,8 +29,8 @@ export const InventoryApi = {
     return await request.get({ url: '/wms/inventory/page', params })
   },
 
-  // 查询指定仓库的库存统计列表
-  getInventoryListByWarehouseId: async (warehouseId: number) => {
-    return await request.get({ url: '/wms/inventory/list-by-warehouse-id', params: { warehouseId } })
+  // 查询库存统计列表
+  getInventoryList: async (params: InventoryListReqVO) => {
+    return await request.get({ url: '/wms/inventory/list', params })
   }
 }

From 24343f66fc047d3bc65de53ac2bed71c143fa045 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 11:00:14 +0800
Subject: [PATCH 37/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20check=20=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/md/item/sku/index.ts              |  10 +
 .../md/item/sku/components/ItemSkuSelect.vue  |  91 +++-----
 src/views/wms/order/check/CheckOrderForm.vue  | 201 +++++++++++++++---
 3 files changed, 207 insertions(+), 95 deletions(-)

diff --git a/src/api/wms/md/item/sku/index.ts b/src/api/wms/md/item/sku/index.ts
index be07f41ff..886d91b36 100644
--- a/src/api/wms/md/item/sku/index.ts
+++ b/src/api/wms/md/item/sku/index.ts
@@ -1,3 +1,5 @@
+import request from '@/config/axios'
+
 // WMS 商品 SKU VO
 export interface ItemSkuVO {
   id?: number
@@ -21,3 +23,11 @@ export interface ItemSkuVO {
   sellingPrice?: number
   createTime?: Date
 }
+
+// WMS 商品 SKU API
+export const ItemSkuApi = {
+  // 按 SKU 维度分页（支持商品 / 品牌 / 分类多表联查筛选）
+  getItemSkuPage: async (params: any) => {
+    return await request.get({ url: '/wms/item-sku/page', params })
+  }
+}
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
index 793ea5d2d..3fcabc335 100644
--- a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -34,24 +34,33 @@
             @keyup.enter="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="规格名称" prop="skuName">
+        <el-form-item label="规格名称" prop="name">
           <el-input
-            v-model="queryParams.skuName"
+            v-model="queryParams.name"
             class="!w-240px"
             clearable
             placeholder="请输入规格名称"
             @keyup.enter="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="规格编号" prop="skuCode">
+        <el-form-item label="规格编号" prop="code">
           <el-input
-            v-model="queryParams.skuCode"
+            v-model="queryParams.code"
             class="!w-240px"
             clearable
             placeholder="请输入规格编号"
             @keyup.enter="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="条码" prop="barCode">
+          <el-input
+            v-model="queryParams.barCode"
+            class="!w-240px"
+            clearable
+            placeholder="请输入条码"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
             <Icon class="mr-5px" icon="ep:search" />
@@ -144,8 +153,7 @@
 
 <script lang="ts" setup>
 import { ElTable } from 'element-plus'
-import { ItemApi, ItemVO } from '@/api/wms/md/item'
-import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import { ItemSkuApi, ItemSkuVO } from '@/api/wms/md/item/sku'
 import { formatDimensionText, formatPrice, formatWeight } from '@/views/wms/utils/format'
 
 /** WMS 商品 SKU 选择器 */
@@ -154,8 +162,6 @@ defineOptions({ name: 'WmsItemSkuSelect' })
 const message = useMessage() // 消息弹窗
 const loading = ref(false) // 列表的加载中
 const dialogVisible = ref(false) // 弹窗的是否展示
-const allList = ref<ItemSkuVO[]>([]) // 全部 SKU 列表
-const filteredList = ref<ItemSkuVO[]>([]) // 过滤后的 SKU 列表
 const list = ref<ItemSkuVO[]>([]) // 当前页 SKU 列表
 const total = ref(0) // 列表的总条数
 const selectedList = ref<ItemSkuVO[]>([]) // 已选择 SKU 列表
@@ -172,8 +178,9 @@ const getDefaultQueryParams = () => ({
   pageSize: 10,
   itemName: undefined as string | undefined,
   itemCode: undefined as string | undefined,
-  skuName: undefined as string | undefined,
-  skuCode: undefined as string | undefined
+  name: undefined as string | undefined,
+  code: undefined as string | undefined,
+  barCode: undefined as string | undefined
 })
 const queryParams = reactive(getDefaultQueryParams())
 
@@ -196,72 +203,24 @@ const open = async (
   disabledSelectedIds.value = new Set(preSelectedIds.value)
   await nextTick()
   tableRef.value?.clearSelection()
-  await loadSkuList()
+  await getList()
 }
 defineExpose({ open })
 
-/** 获得 SKU 列表 */
-const loadSkuList = async () => {
+/** 查询 SKU 列表（服务端分页 + 服务端筛选） */
+const getList = async () => {
   loading.value = true
   try {
-    const items = await ItemApi.getItemSimpleList()
-    allList.value = items.flatMap((item: ItemVO) =>
-      (item.skus || []).map((sku) => ({
-        ...sku,
-        itemId: item.id,
-        itemCode: item.code,
-        itemName: item.name,
-        categoryId: item.categoryId,
-        categoryName: item.categoryName,
-        unit: item.unit,
-        brandId: item.brandId,
-        brandName: item.brandName
-      }))
-    )
-    initSelectedList()
-    getList()
+    const data = await ItemSkuApi.getItemSkuPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+    await nextTick()
+    applyPreSelection()
   } finally {
     loading.value = false
   }
 }
 
-/** 初始化已选 SKU */
-const initSelectedList = () => {
-  if (!preselectDisabled.value || preSelectedIds.value.length === 0) {
-    return
-  }
-  allList.value.forEach((sku) => {
-    if (sku.id && preSelectedIds.value.includes(sku.id)) {
-      selectedMap.value.set(sku.id, sku)
-    }
-  })
-  selectedList.value = Array.from(selectedMap.value.values())
-}
-
-/** 查询 SKU 列表 */
-const getList = async () => {
-  filteredList.value = allList.value.filter((sku) => {
-    return (
-      includes(sku.itemName, queryParams.itemName) &&
-      includes(sku.itemCode, queryParams.itemCode) &&
-      includes(sku.name, queryParams.skuName) &&
-      includes(sku.code, queryParams.skuCode)
-    )
-  })
-  total.value = filteredList.value.length
-  const start = (queryParams.pageNo - 1) * queryParams.pageSize
-  list.value = filteredList.value.slice(start, start + queryParams.pageSize)
-  await nextTick()
-  applyPreSelection()
-}
-
-const includes = (value?: string, keyword?: string) => {
-  if (!keyword) {
-    return true
-  }
-  return (value || '').toLowerCase().includes(keyword.toLowerCase())
-}
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 4067609ae..1cef1417b 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -1,5 +1,22 @@
 <!-- WMS 盘库单表单 -->
 <template>
+  <Dialog v-model="warehouseDialogVisible" title="选择盘库仓库" width="420px">
+    <el-form
+      ref="warehouseFormRef"
+      :model="warehouseFormData"
+      :rules="warehouseFormRules"
+      label-width="80px"
+    >
+      <el-form-item label="仓库" prop="warehouseId">
+        <WarehouseSelect v-model="warehouseFormData.warehouseId" @change="handleWarehouseSelect" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="handleStartCheck">开始盘库</el-button>
+      <el-button @click="warehouseDialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+
   <Dialog v-model="dialogVisible" :title="dialogTitle" width="1280px">
     <el-form
       ref="formRef"
@@ -16,7 +33,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="仓库" prop="warehouseId">
-            <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
+            <WarehouseSelect v-model="formData.warehouseId" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -56,10 +73,19 @@
               :disabled="!formData.warehouseId"
               plain
               type="primary"
-              @click="handleAddDetail"
+              @click="handleImportAllInventory"
+            >
+              <Icon class="mr-5px" icon="ep:download" />
+              导入仓库库存
+            </el-button>
+            <el-button
+              :disabled="!formData.warehouseId"
+              plain
+              type="primary"
+              @click="handleAddSkuInventory"
             >
               <Icon class="mr-5px" icon="ep:plus" />
-              添加商品
+              添加盘点商品
             </el-button>
           </span>
         </el-tooltip>
@@ -149,11 +175,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <InventorySelect
-        ref="inventorySelectRef"
-        :warehouse-id="formData.warehouseId"
-        @change="handleSelectInventory"
-      />
+      <ItemSkuSelect ref="skuSelectRef" @change="handleSelectSku" />
     </el-form>
     <template #footer>
       <div class="flex items-center justify-between">
@@ -198,9 +220,10 @@ import { FormRules } from 'element-plus'
 import { h } from 'vue'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import InventorySelect, {
-  InventorySelectRow
-} from '@/views/wms/inventory/components/InventorySelect.vue'
+import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
+import { ItemSkuVO } from '@/api/wms/md/item/sku'
+import { WarehouseVO } from '@/api/wms/md/warehouse'
+import ItemSkuSelect from '@/views/wms/md/item/sku/components/ItemSkuSelect.vue'
 import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
@@ -230,9 +253,11 @@ const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref('')
 const originalFormData = ref('')
+const warehouseDialogVisible = ref(false)
 
 type CheckOrderFormDetail = CheckOrderDetailVO & { actualPrice?: number }
 type CheckOrderFormData = Omit<CheckOrderVO, 'details'> & { details?: CheckOrderFormDetail[] }
+type CheckInventoryRow = InventoryVO & { price?: number; availableQuantity?: number }
 
 const formData = ref<CheckOrderFormData>({
   id: undefined,
@@ -249,7 +274,15 @@ const formRules = reactive<FormRules>({
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
 })
 const formRef = ref()
-const inventorySelectRef = ref()
+const skuSelectRef = ref()
+const warehouseFormRef = ref()
+const warehouseFormData = reactive({
+  warehouseId: undefined as number | undefined,
+  warehouseName: undefined as string | undefined
+})
+const warehouseFormRules = reactive<FormRules>({
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
+})
 
 const getDifferenceQuantity = (detail: CheckOrderFormDetail) =>
   Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
@@ -290,9 +323,19 @@ const isSavedPrepareOrder = computed(
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
+  formType.value = type
+  if (type === 'create') {
+    dialogVisible.value = false
+    resetForm()
+    warehouseDialogVisible.value = true
+    warehouseFormData.warehouseId = undefined
+    warehouseFormData.warehouseName = undefined
+    await nextTick()
+    warehouseFormRef.value?.clearValidate()
+    return
+  }
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
-  formType.value = type
   resetForm()
   if (id) {
     formLoading.value = true
@@ -307,8 +350,26 @@ const open = async (type: string, id?: number) => {
 }
 defineExpose({ open })
 
+/** 选择仓库后开始盘库 */
+const handleStartCheck = async () => {
+  await warehouseFormRef.value.validate()
+  warehouseDialogVisible.value = false
+  dialogVisible.value = true
+  dialogTitle.value = t('action.create')
+  resetForm()
+  formData.value.warehouseId = warehouseFormData.warehouseId
+  formData.value.warehouseName = warehouseFormData.warehouseName
+  await nextTick()
+  originalFormData.value = JSON.stringify(buildSubmitData())
+}
+
+/** 记录选中的盘库仓库 */
+const handleWarehouseSelect = (warehouse: WarehouseVO | undefined) => {
+  warehouseFormData.warehouseName = warehouse?.name
+}
+
 /** 构建盘库明细 */
-const buildDetail = (inventory: InventorySelectRow): CheckOrderFormDetail => ({
+const buildDetail = (inventory: CheckInventoryRow): CheckOrderFormDetail => ({
   id: undefined,
   itemId: inventory.itemId,
   itemCode: inventory.itemCode,
@@ -333,25 +394,107 @@ const normalizeDetails = (details: CheckOrderDetailVO[]) =>
     actualPrice: multiplyPrice(detail.checkQuantity, detail.price)
   }))
 
-const handleAddDetail = () => inventorySelectRef.value?.open()
-const handleSelectInventory = (inventories: InventorySelectRow[]) => {
-  if (!inventories.length) return
-  formData.value.details = formData.value.details || []
-  inventories.forEach((inventory) => {
-    if (isInventorySelected(inventory)) return
-    formData.value.details!.push(buildDetail(inventory))
-  })
+/** 导入当前仓库的全部库存余额 */
+const handleImportAllInventory = async () => {
+  if (!formData.value.warehouseId) {
+    message.warning('请先选择仓库')
+    return
+  }
+  if (formData.value.details?.length) {
+    await message.confirm('导入仓库库存会覆盖当前盘库明细，是否继续？')
+  }
+  formLoading.value = true
+  try {
+    const inventories = await loadWarehouseInventoryList()
+    formData.value.details = inventories.map((inventory) =>
+      buildDetail({ ...inventory, availableQuantity: inventory.quantity })
+    )
+  } finally {
+    formLoading.value = false
+  }
 }
-const isInventorySelected = (inventory: InventorySelectRow) =>
-  (formData.value.details || []).some((detail) => {
-    return detail.inventoryId === inventory.id
-  })
+
+/** 打开盘点商品添加弹窗 */
+const handleAddSkuInventory = () => {
+  if (!formData.value.warehouseId) {
+    message.warning('请先选择仓库')
+    return
+  }
+  skuSelectRef.value?.open(getSelectedSkuIds(), { multiple: false, preselectDisabled: false })
+}
+
+/** 选择商品 SKU */
+const handleSelectSku = async (skus: ItemSkuVO[]) => {
+  if (!skus.length) {
+    return
+  }
+  formLoading.value = true
+  try {
+    const warehouseInventoryMap = await getWarehouseInventoryMap()
+    formData.value.details = formData.value.details || []
+    const selectedSkuIds = new Set(getSelectedSkuIds())
+    skus.forEach((sku) => {
+      if (!sku.id || selectedSkuIds.has(sku.id)) {
+        return
+      }
+      const inventory = warehouseInventoryMap.get(sku.id)
+      formData.value.details!.push(
+        inventory
+          ? buildDetail({ ...inventory, availableQuantity: inventory.quantity })
+          : buildZeroInventoryDetail(sku)
+      )
+      selectedSkuIds.add(sku.id)
+    })
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 获得已选 SKU 编号 */
+const getSelectedSkuIds = () => {
+  return (formData.value.details || [])
+    .map((detail) => detail.skuId)
+    .filter((id): id is number => !!id)
+}
+
+/** 查询当前仓库全部库存余额 */
+const loadWarehouseInventoryList = async (): Promise<InventoryVO[]> => {
+  return await InventoryApi.getInventoryList({ warehouseId: formData.value.warehouseId! })
+}
+
+/** 获得当前仓库 SKU 对应库存余额 */
+const getWarehouseInventoryMap = async (): Promise<Map<number, InventoryVO>> => {
+  const inventories = await loadWarehouseInventoryList()
+  return new Map(
+    inventories
+      .filter((inventory) => !!inventory.skuId)
+      .map((inventory) => [inventory.skuId!, inventory] as const)
+  )
+}
+
+/** 构建零库存盘库明细 */
+const buildZeroInventoryDetail = (sku: ItemSkuVO): CheckOrderFormDetail => ({
+  id: undefined,
+  itemId: sku.itemId,
+  itemCode: sku.itemCode,
+  itemName: sku.itemName,
+  unit: sku.unit,
+  skuId: sku.id,
+  skuCode: sku.code,
+  skuName: sku.name,
+  inventoryId: undefined,
+  warehouseId: formData.value.warehouseId,
+  warehouseName: formData.value.warehouseName,
+  quantity: 0,
+  checkQuantity: 0,
+  availableQuantity: 0,
+  price: sku.costPrice,
+  actualPrice: 0
+})
+
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
 }
-const handleWarehouseChange = () => {
-  formData.value.details = []
-}
 
 const handleDetailCheckQuantityChange = (detail: CheckOrderFormDetail) => {
   if (detail.price !== undefined && detail.price !== null) {

From f82ae7e0c8f2588802ac16f6450f3addb15e4f77 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 12:59:11 +0800
Subject: [PATCH 38/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B4=E4=BD=93=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/WmsHomeInventoryCharts.vue     |   4 +-
 .../components/WmsHomeOrderSummaryCards.vue   |   4 +-
 .../inventory/components/InventorySelect.vue  |  20 ++-
 src/views/wms/md/item/ItemForm.vue            |  28 ++--
 .../wms/md/item/category/ItemCategoryForm.vue |   8 +-
 src/views/wms/md/item/index.vue               |   9 +-
 .../md/item/sku/components/ItemSkuSelect.vue  |  22 +--
 .../wms/order/check/CheckOrderDetail.vue      |  29 ++--
 src/views/wms/order/check/CheckOrderForm.vue  | 141 +++++++++++-------
 src/views/wms/order/check/CheckOrderPrint.vue |  15 +-
 src/views/wms/order/check/index.vue           |  46 +++---
 .../order/movement/MovementOrderDetail.vue    |  22 ++-
 .../wms/order/movement/MovementOrderForm.vue  |  74 +++++----
 src/views/wms/order/movement/index.vue        |  44 +++---
 .../wms/order/receipt/ReceiptOrderDetail.vue  |   6 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    |  40 ++---
 src/views/wms/order/receipt/index.vue         |  48 +++---
 .../order/shipment/ShipmentOrderDetail.vue    |   6 +-
 .../wms/order/shipment/ShipmentOrderForm.vue  |  46 +++---
 src/views/wms/order/shipment/index.vue        |  48 +++---
 src/views/wms/utils/constants.ts              |   2 +-
 src/views/wms/utils/format.ts                 |  32 ++--
 src/views/wms/utils/order.ts                  |   2 +-
 23 files changed, 414 insertions(+), 282 deletions(-)

diff --git a/src/views/wms/home/components/WmsHomeInventoryCharts.vue b/src/views/wms/home/components/WmsHomeInventoryCharts.vue
index 1eaeef6a3..a0ca3f6fc 100644
--- a/src/views/wms/home/components/WmsHomeInventoryCharts.vue
+++ b/src/views/wms/home/components/WmsHomeInventoryCharts.vue
@@ -63,7 +63,9 @@ const goodsShareList = ref<ChartItem[]>([])
 const inventoryDistributionList = ref<ChartItem[]>([])
 
 /** 格式化库存数量展示 */
-const formatQuantityText = (value: number) => formatQuantity(value) || '0.00'
+function formatQuantityText(value: number) {
+  return formatQuantity(value) || '0.00'
+}
 
 const chartFontFamily =
   "Inter, 'Helvetica Neue', Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif"
diff --git a/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
index a87a70bc0..23af97527 100644
--- a/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
+++ b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
@@ -213,7 +213,9 @@ const getStatusPercent = (item: OrderSummaryItem, status: number) => {
 }
 
 /** 格式化单据数量 */
-const formatCount = (value: number) => value.toLocaleString()
+function formatCount(value: number) {
+  return value.toLocaleString()
+}
 
 defineExpose({ load })
 </script>
diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
index 196cdd7cd..125355875 100644
--- a/src/views/wms/inventory/components/InventorySelect.vue
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -148,14 +148,18 @@ const total = ref(0) // 列表的总条数
 const selectedMap = ref<Map<string, InventorySelectRow>>(new Map()) // 跨页已选择库存
 const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
 const queryFormRef = ref() // 搜索的表单
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  itemName: undefined as string | undefined,
-  itemCode: undefined as string | undefined,
-  skuName: undefined as string | undefined,
-  skuCode: undefined as string | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    itemName: undefined as string | undefined,
+    itemCode: undefined as string | undefined,
+    skuName: undefined as string | undefined,
+    skuCode: undefined as string | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 
 const emit = defineEmits<{
diff --git a/src/views/wms/md/item/ItemForm.vue b/src/views/wms/md/item/ItemForm.vue
index 81856fa3e..a8a3ebcda 100644
--- a/src/views/wms/md/item/ItemForm.vue
+++ b/src/views/wms/md/item/ItemForm.vue
@@ -236,19 +236,21 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 构建空规格 */
-const buildEmptySku = (): ItemSkuVO => ({
-  id: undefined,
-  name: undefined,
-  barCode: undefined,
-  code: undefined,
-  length: undefined,
-  width: undefined,
-  height: undefined,
-  grossWeight: undefined,
-  netWeight: undefined,
-  costPrice: undefined,
-  sellingPrice: undefined
-})
+function buildEmptySku(): ItemSkuVO {
+  return {
+    id: undefined,
+    name: undefined,
+    barCode: undefined,
+    code: undefined,
+    length: undefined,
+    width: undefined,
+    height: undefined,
+    grossWeight: undefined,
+    netWeight: undefined,
+    costPrice: undefined,
+    sellingPrice: undefined
+  }
+}
 
 /** 添加规格 */
 const handleAddSku = () => {
diff --git a/src/views/wms/md/item/category/ItemCategoryForm.vue b/src/views/wms/md/item/category/ItemCategoryForm.vue
index fcbfaa052..9b13664d0 100644
--- a/src/views/wms/md/item/category/ItemCategoryForm.vue
+++ b/src/views/wms/md/item/category/ItemCategoryForm.vue
@@ -122,9 +122,13 @@ const getTree = async () => {
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
+  if (!formRef) {
+    return
+  }
   const valid = await formRef.value.validate()
-  if (!valid) return
+  if (!valid) {
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
diff --git a/src/views/wms/md/item/index.vue b/src/views/wms/md/item/index.vue
index 88c3fc03b..b7eb83756 100644
--- a/src/views/wms/md/item/index.vue
+++ b/src/views/wms/md/item/index.vue
@@ -104,20 +104,20 @@
           </el-table-column>
           <el-table-column label="金额(元)" min-width="140">
             <template #default="scope">
-              <div v-if="hasValue(scope.row.costPrice)">
+              <div v-if="!isNullOrUnDef(scope.row.costPrice)">
                 成本价：{{ formatPrice(scope.row.costPrice) }}
               </div>
-              <div v-if="hasValue(scope.row.sellingPrice)">
+              <div v-if="!isNullOrUnDef(scope.row.sellingPrice)">
                 销售价：{{ formatPrice(scope.row.sellingPrice) }}
               </div>
             </template>
           </el-table-column>
           <el-table-column label="重量(kg)" min-width="140">
             <template #default="scope">
-              <div v-if="hasValue(scope.row.netWeight)">
+              <div v-if="!isNullOrUnDef(scope.row.netWeight)">
                 净重：{{ formatWeight(scope.row.netWeight) }}
               </div>
-              <div v-if="hasValue(scope.row.grossWeight)">
+              <div v-if="!isNullOrUnDef(scope.row.grossWeight)">
                 毛重：{{ formatWeight(scope.row.grossWeight) }}
               </div>
             </template>
@@ -200,7 +200,6 @@ const queryParams = reactive<{
 const queryFormRef = ref() // 搜索的表单
 const categoryTreeRef = ref() // 分类树
 const exportLoading = ref(false) // 导出的加载中
-const hasValue = (value?: number | string | null) => !isNullOrUnDef(value)
 
 /** 查询商品列表 */
 const getList = async () => {
diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
index 3fcabc335..39c74d613 100644
--- a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
+++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue
@@ -173,15 +173,19 @@ const preselectDisabled = ref(true) // 是否回显已禁用的 SKU
 const syncingSingleSelection = ref(false) // 单选模式同步表格勾选状态中
 const tableRef = ref<InstanceType<typeof ElTable>>() // 表格 Ref
 const queryFormRef = ref() // 搜索的表单
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  itemName: undefined as string | undefined,
-  itemCode: undefined as string | undefined,
-  name: undefined as string | undefined,
-  code: undefined as string | undefined,
-  barCode: undefined as string | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    itemName: undefined as string | undefined,
+    itemCode: undefined as string | undefined,
+    name: undefined as string | undefined,
+    code: undefined as string | undefined,
+    barCode: undefined as string | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 
 const emit = defineEmits<{
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 086a12ea9..a44230454 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -124,11 +124,16 @@ defineOptions({ name: 'WmsCheckOrderDetail' })
 const loading = ref(false)
 const dialogVisible = ref(false)
 const detailData = ref<CheckOrderVO>({})
-const getOrderDifferencePrice = (order: CheckOrderVO) =>
-  roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
-const getDifferenceQuantity = (detail: CheckOrderDetailVO) =>
-  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
-const getActualPrice = (detail: CheckOrderDetailVO) => {
+
+function getOrderDifferencePrice(order: CheckOrderVO) {
+  return roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
+}
+
+function getDifferenceQuantity(detail: CheckOrderDetailVO) {
+  return Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+}
+
+function getActualPrice(detail: CheckOrderDetailVO) {
   if (
     detail.checkQuantity === undefined ||
     detail.checkQuantity === null ||
@@ -139,19 +144,22 @@ const getActualPrice = (detail: CheckOrderDetailVO) => {
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
 }
-const getDifferencePrice = (detail: CheckOrderDetailVO) => {
+function getDifferencePrice(detail: CheckOrderDetailVO) {
   if (detail.price === undefined || detail.price === null) {
     return undefined
   }
   return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
 }
-const renderLossText = (
+function renderLossText(
   value: number | string | null | undefined,
   formatter: (value?: number | string | null) => string
-) => h('span', { class: getLossClass(value) }, formatter(value))
+) {
+  return h('span', { class: getLossClass(value) }, formatter(value))
+}
 
-const getSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderDetailVO[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getSummaries({ columns, data }: { columns: any[]; data: CheckOrderDetailVO[] }) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -178,6 +186,7 @@ const getSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderDetai
     }
     return ''
   })
+}
 
 /** 打开弹窗 */
 const open = async (id: number) => {
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 1cef1417b..2e3fa6bb7 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -284,21 +284,31 @@ const warehouseFormRules = reactive<FormRules>({
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
 })
 
-const getDifferenceQuantity = (detail: CheckOrderFormDetail) =>
-  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
-const getBookPrice = (detail: CheckOrderFormDetail) => multiplyPrice(detail.quantity, detail.price)
-const getActualPrice = (detail: CheckOrderFormDetail) =>
-  detail.actualPrice ?? multiplyPrice(detail.checkQuantity, detail.price)
-const getDifferencePrice = (detail: CheckOrderFormDetail) => {
+function getDifferenceQuantity(detail: CheckOrderFormDetail) {
+  return Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+}
+
+function getBookPrice(detail: CheckOrderFormDetail) {
+  return multiplyPrice(detail.quantity, detail.price)
+}
+
+function getActualPrice(detail: CheckOrderFormDetail) {
+  return detail.actualPrice ?? multiplyPrice(detail.checkQuantity, detail.price)
+}
+
+function getDifferencePrice(detail: CheckOrderFormDetail) {
   if (detail.price === undefined || detail.price === null) {
     return undefined
   }
   return roundPrice(getDifferenceQuantity(detail) * Number(detail.price))
 }
-const renderLossText = (
+
+function renderLossText(
   value: number | string | null | undefined,
   formatter: (value?: number | string | null) => string
-) => h('span', { class: getLossClass(value) }, formatter(value))
+) {
+  return h('span', { class: getLossClass(value) }, formatter(value))
+}
 const totalQuantity = computed(() =>
   sumQuantity(formData.value.details || [], (detail) => getDifferenceQuantity(detail))
 )
@@ -369,30 +379,33 @@ const handleWarehouseSelect = (warehouse: WarehouseVO | undefined) => {
 }
 
 /** 构建盘库明细 */
-const buildDetail = (inventory: CheckInventoryRow): CheckOrderFormDetail => ({
-  id: undefined,
-  itemId: inventory.itemId,
-  itemCode: inventory.itemCode,
-  itemName: inventory.itemName,
-  unit: inventory.unit,
-  skuId: inventory.skuId,
-  skuCode: inventory.skuCode,
-  skuName: inventory.skuName,
-  inventoryId: inventory.id,
-  warehouseId: inventory.warehouseId,
-  warehouseName: inventory.warehouseName,
-  quantity: inventory.availableQuantity,
-  checkQuantity: inventory.availableQuantity,
-  availableQuantity: inventory.availableQuantity,
-  price: inventory.price,
-  actualPrice: multiplyPrice(inventory.availableQuantity, inventory.price)
-})
+function buildDetail(inventory: CheckInventoryRow): CheckOrderFormDetail {
+  return {
+    id: undefined,
+    itemId: inventory.itemId,
+    itemCode: inventory.itemCode,
+    itemName: inventory.itemName,
+    unit: inventory.unit,
+    skuId: inventory.skuId,
+    skuCode: inventory.skuCode,
+    skuName: inventory.skuName,
+    inventoryId: inventory.id,
+    warehouseId: inventory.warehouseId,
+    warehouseName: inventory.warehouseName,
+    quantity: inventory.availableQuantity,
+    checkQuantity: inventory.availableQuantity,
+    availableQuantity: inventory.availableQuantity,
+    price: inventory.price,
+    actualPrice: multiplyPrice(inventory.availableQuantity, inventory.price)
+  }
+}
 
-const normalizeDetails = (details: CheckOrderDetailVO[]) =>
-  details.map((detail) => ({
+function normalizeDetails(details: CheckOrderDetailVO[]) {
+  return details.map((detail) => ({
     ...detail,
     actualPrice: multiplyPrice(detail.checkQuantity, detail.price)
   }))
+}
 
 /** 导入当前仓库的全部库存余额 */
 const handleImportAllInventory = async () => {
@@ -473,24 +486,26 @@ const getWarehouseInventoryMap = async (): Promise<Map<number, InventoryVO>> =>
 }
 
 /** 构建零库存盘库明细 */
-const buildZeroInventoryDetail = (sku: ItemSkuVO): CheckOrderFormDetail => ({
-  id: undefined,
-  itemId: sku.itemId,
-  itemCode: sku.itemCode,
-  itemName: sku.itemName,
-  unit: sku.unit,
-  skuId: sku.id,
-  skuCode: sku.code,
-  skuName: sku.name,
-  inventoryId: undefined,
-  warehouseId: formData.value.warehouseId,
-  warehouseName: formData.value.warehouseName,
-  quantity: 0,
-  checkQuantity: 0,
-  availableQuantity: 0,
-  price: sku.costPrice,
-  actualPrice: 0
-})
+function buildZeroInventoryDetail(sku: ItemSkuVO): CheckOrderFormDetail {
+  return {
+    id: undefined,
+    itemId: sku.itemId,
+    itemCode: sku.itemCode,
+    itemName: sku.itemName,
+    unit: sku.unit,
+    skuId: sku.id,
+    skuCode: sku.code,
+    skuName: sku.name,
+    inventoryId: undefined,
+    warehouseId: formData.value.warehouseId,
+    warehouseName: formData.value.warehouseName,
+    quantity: 0,
+    checkQuantity: 0,
+    availableQuantity: 0,
+    price: sku.costPrice,
+    actualPrice: 0
+  }
+}
 
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
@@ -512,20 +527,30 @@ const handleDetailActualPriceChange = (detail: CheckOrderFormDetail) => {
   detail.price = dividePrice(detail.actualPrice, detail.checkQuantity)
 }
 
-const getDetailSummaries = ({ columns, data }: { columns: any[]; data: CheckOrderFormDetail[] }) =>
-  columns.map((column, index) => {
-    if (index === 0) return '合计'
-    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
-    if (column.property === 'checkQuantity')
+/** 计算表格的合计行数据 */
+function getDetailSummaries({ columns, data }: { columns: any[]; data: CheckOrderFormDetail[] }) {
+  return columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'checkQuantity') {
       return formatSumQuantity(data, (detail) => detail.checkQuantity)
-    if (column.property === 'actualPrice')
+    }
+    if (column.property === 'actualPrice') {
       return formatSumPrice(data, (detail) => getActualPrice(detail))
-    if (column.property === 'differenceQuantity')
+    }
+    if (column.property === 'differenceQuantity') {
       return renderLossText(totalQuantity.value, formatQuantity)
-    if (column.property === 'differencePrice')
+    }
+    if (column.property === 'differencePrice') {
       return renderLossText(differencePrice.value, formatPrice)
+    }
     return ''
   })
+}
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
@@ -566,7 +591,9 @@ const buildSubmitData = () => {
 const emit = defineEmits(['success'])
 const submitForm = async () => {
   await formRef.value.validate()
-  if (!validateDetails(false)) return
+  if (!validateDetails(false)) {
+    return
+  }
   formLoading.value = true
   try {
     const data = buildSubmitData()
@@ -587,7 +614,9 @@ const submitForm = async () => {
 /** 完成盘库：表单修改过则先保存，再完成 */
 const handleComplete = async () => {
   await formRef.value.validate()
-  if (!validateDetails(true)) return
+  if (!validateDetails(true)) {
+    return
+  }
   try {
     await message.confirm('确认完成盘库？完成后将更新库存。')
     formLoading.value = true
diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index 425a45c30..f65e1deaf 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -149,9 +149,11 @@ interface PrintRow extends CheckOrderDetailVO {
   differencePrice?: number
 }
 
-const getDifferenceQuantity = (detail: CheckOrderDetailVO) =>
-  Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
-const getActualPrice = (detail: CheckOrderDetailVO) => {
+function getDifferenceQuantity(detail: CheckOrderDetailVO) {
+  return Number(detail.checkQuantity || 0) - Number(detail.quantity || 0)
+}
+
+function getActualPrice(detail: CheckOrderDetailVO) {
   if (
     detail.checkQuantity === undefined ||
     detail.checkQuantity === null ||
@@ -162,14 +164,15 @@ const getActualPrice = (detail: CheckOrderDetailVO) => {
   }
   return roundPrice(Number(detail.checkQuantity) * Number(detail.price))
 }
-const getDifferencePrice = (detail: CheckOrderDetailVO, differenceQuantity: number) => {
+function getDifferencePrice(detail: CheckOrderDetailVO, differenceQuantity: number) {
   if (detail.price === undefined || detail.price === null) {
     return undefined
   }
   return roundPrice(differenceQuantity * Number(detail.price))
 }
-const getOrderDifferencePrice = (order: CheckOrderVO) =>
-  roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
+function getOrderDifferencePrice(order: CheckOrderVO) {
+  return roundPrice(Number(order.actualPrice || 0) - Number(order.totalPrice || 0))
+}
 const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => {
     const differenceQuantity = getDifferenceQuantity(detail)
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 76fefc4eb..7678a3bd9 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -436,34 +436,42 @@ const checkedTableColumns = ref<TableColumnKey[]>([
   'operateInfo',
   'remark'
 ])
-const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
 const loading = ref(true) // 列表的加载中
 const list = ref<CheckOrderVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  no: undefined as string | undefined,
-  status: undefined as number | undefined,
-  warehouseId: undefined as number | undefined,
-  orderTime: undefined as string[] | undefined,
-  totalQuantityMin: undefined as number | undefined,
-  totalQuantityMax: undefined as number | undefined,
-  totalPriceMin: undefined as number | undefined,
-  totalPriceMax: undefined as number | undefined,
-  actualPriceMin: undefined as number | undefined,
-  actualPriceMax: undefined as number | undefined,
-  creator: undefined as number | undefined,
-  updater: undefined as number | undefined,
-  createTime: undefined as string[] | undefined,
-  updateTime: undefined as string[] | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    no: undefined as string | undefined,
+    status: undefined as number | undefined,
+    warehouseId: undefined as number | undefined,
+    orderTime: undefined as string[] | undefined,
+    totalQuantityMin: undefined as number | undefined,
+    totalQuantityMax: undefined as number | undefined,
+    totalPriceMin: undefined as number | undefined,
+    totalPriceMax: undefined as number | undefined,
+    actualPriceMin: undefined as number | undefined,
+    actualPriceMax: undefined as number | undefined,
+    creator: undefined as number | undefined,
+    updater: undefined as number | undefined,
+    createTime: undefined as string[] | undefined,
+    updateTime: undefined as string[] | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, CheckOrderDetailVO[]>>({}) // 盘库单明细数据
 
+/** 判断表格列是否可见 */
+function isTableColumnVisible(column: TableColumnKey) {
+  return checkedTableColumns.value.includes(column)
+}
+
 /** 是否允许修改盘库单 */
 const canUpdateCheckOrder = (status?: number) => {
   return status !== undefined && OrderUpdateStatusList.includes(status)
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 320c479c2..6644cb44a 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -110,14 +110,24 @@ const detailRows = computed<DetailRow[]>(() =>
   }))
 )
 
-const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
-  columns.map((column, index) => {
-    if (index === 0) return '合计'
-    if (column.property === 'quantity') return formatSumQuantity(data, (detail) => detail.quantity)
-    if (column.property === 'price') return formatSumPrice(data, (detail) => detail.price)
-    if (column.property === 'totalPrice') return formatSumPrice(data, (detail) => detail.totalPrice)
+/** 计算表格的合计行数据 */
+function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] }) {
+  return columns.map((column, index) => {
+    if (index === 0) {
+      return '合计'
+    }
+    if (column.property === 'quantity') {
+      return formatSumQuantity(data, (detail) => detail.quantity)
+    }
+    if (column.property === 'price') {
+      return formatSumPrice(data, (detail) => detail.price)
+    }
+    if (column.property === 'totalPrice') {
+      return formatSumPrice(data, (detail) => detail.totalPrice)
+    }
     return ''
   })
+}
 
 /** 打开弹窗 */
 const open = async (id: number) => {
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 377799cce..f672b22bf 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -279,29 +279,32 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open })
 
 /** 构建移库明细 */
-const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
-  id: undefined,
-  itemId: inventory.itemId,
-  itemCode: inventory.itemCode,
-  itemName: inventory.itemName,
-  unit: inventory.unit,
-  skuId: inventory.skuId,
-  skuCode: inventory.skuCode,
-  skuName: inventory.skuName,
-  sourceWarehouseId: inventory.warehouseId,
-  sourceWarehouseName: inventory.warehouseName,
-  targetWarehouseId: formData.value.targetWarehouseId,
-  quantity: undefined,
-  availableQuantity: inventory.availableQuantity,
-  price: undefined,
-  totalPrice: undefined
-})
+function buildDetail(inventory: InventorySelectRow): MovementOrderDetailVO {
+  return {
+    id: undefined,
+    itemId: inventory.itemId,
+    itemCode: inventory.itemCode,
+    itemName: inventory.itemName,
+    unit: inventory.unit,
+    skuId: inventory.skuId,
+    skuCode: inventory.skuCode,
+    skuName: inventory.skuName,
+    sourceWarehouseId: inventory.warehouseId,
+    sourceWarehouseName: inventory.warehouseName,
+    targetWarehouseId: formData.value.targetWarehouseId,
+    quantity: undefined,
+    availableQuantity: inventory.availableQuantity,
+    price: undefined,
+    totalPrice: undefined
+  }
+}
 
-const normalizeDetails = (details: MovementOrderDetailVO[]) =>
-  details.map((detail) => ({
+function normalizeDetails(details: MovementOrderDetailVO[]) {
+  return details.map((detail) => ({
     ...detail,
     totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
+}
 
 /** 打开库存选择弹窗 */
 const handleAddDetail = () => {
@@ -313,19 +316,24 @@ const handleAddDetail = () => {
 
 /** 选择库存 */
 const handleSelectInventory = (inventories: InventorySelectRow[]) => {
-  if (!inventories.length) return
+  if (!inventories.length) {
+    return
+  }
   formData.value.details = formData.value.details || []
   inventories.forEach((inventory) => {
-    if (isInventorySelected(inventory)) return
+    if (isInventorySelected(inventory)) {
+      return
+    }
     formData.value.details!.push(buildDetail(inventory))
   })
 }
 
 /** 判断库存是否已选择 */
-const isInventorySelected = (inventory: InventorySelectRow) =>
-  (formData.value.details || []).some((detail) => {
+function isInventorySelected(inventory: InventorySelectRow) {
+  return (formData.value.details || []).some((detail) => {
     return detail.skuId === inventory.skuId && detail.sourceWarehouseId === inventory.warehouseId
   })
+}
 
 const handleDeleteDetail = (index: number) => {
   formData.value.details?.splice(index, 1)
@@ -360,8 +368,15 @@ const handleDetailTotalPriceChange = (detail: MovementOrderDetailVO) => {
   detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
-const getDetailSummaries = ({ columns, data }: { columns: any[]; data: MovementOrderDetailVO[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getDetailSummaries({
+  columns,
+  data
+}: {
+  columns: any[]
+  data: MovementOrderDetailVO[]
+}) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -376,6 +391,7 @@ const getDetailSummaries = ({ columns, data }: { columns: any[]; data: MovementO
     }
     return ''
   })
+}
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
@@ -421,7 +437,9 @@ const buildSubmitData = () => {
 const emit = defineEmits(['success'])
 const submitForm = async () => {
   await formRef.value.validate()
-  if (!validateDetails(false)) return
+  if (!validateDetails(false)) {
+    return
+  }
   formLoading.value = true
   try {
     const data = buildSubmitData()
@@ -442,7 +460,9 @@ const submitForm = async () => {
 /** 完成移库：表单修改过则先保存，再完成 */
 const handleComplete = async () => {
   await formRef.value.validate()
-  if (!validateDetails(true)) return
+  if (!validateDetails(true)) {
+    return
+  }
   try {
     await message.confirm('确认完成移库？完成后将更新库存。')
     formLoading.value = true
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index b74f493b3..59141e418 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -399,33 +399,41 @@ const checkedTableColumns = ref<TableColumnKey[]>([
   'operateInfo',
   'remark'
 ])
-const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
 const loading = ref(true) // 列表的加载中
 const list = ref<MovementOrderVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  no: undefined as string | undefined,
-  status: undefined as number | undefined,
-  sourceWarehouseId: undefined as number | undefined,
-  targetWarehouseId: undefined as number | undefined,
-  orderTime: undefined as string[] | undefined,
-  totalQuantityMin: undefined as number | undefined,
-  totalQuantityMax: undefined as number | undefined,
-  totalPriceMin: undefined as number | undefined,
-  totalPriceMax: undefined as number | undefined,
-  creator: undefined as number | undefined,
-  updater: undefined as number | undefined,
-  createTime: undefined as string[] | undefined,
-  updateTime: undefined as string[] | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    no: undefined as string | undefined,
+    status: undefined as number | undefined,
+    sourceWarehouseId: undefined as number | undefined,
+    targetWarehouseId: undefined as number | undefined,
+    orderTime: undefined as string[] | undefined,
+    totalQuantityMin: undefined as number | undefined,
+    totalQuantityMax: undefined as number | undefined,
+    totalPriceMin: undefined as number | undefined,
+    totalPriceMax: undefined as number | undefined,
+    creator: undefined as number | undefined,
+    updater: undefined as number | undefined,
+    createTime: undefined as string[] | undefined,
+    updateTime: undefined as string[] | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, MovementOrderDetailVO[]>>({}) // 移库单明细数据
 
+/** 判断表格列是否可见 */
+function isTableColumnVisible(column: TableColumnKey) {
+  return checkedTableColumns.value.includes(column)
+}
+
 /** 是否允许修改移库单 */
 const canUpdateMovementOrder = (status?: number) => {
   return status !== undefined && OrderUpdateStatusList.includes(status)
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index d625baa02..453976be5 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -127,8 +127,9 @@ const detailRows = computed<DetailRow[]>(() =>
   }))
 )
 
-const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] }) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -143,6 +144,7 @@ const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] })
     }
     return ''
   })
+}
 
 /** 打开弹窗 */
 const open = async (id: number) => {
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index dd13313c3..de92a22ff 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -282,25 +282,28 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 构建入库明细 */
-const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
-  id: undefined,
-  itemId: sku.itemId,
-  itemCode: sku.itemCode,
-  itemName: sku.itemName,
-  unit: sku.unit,
-  skuId: sku.id,
-  skuCode: sku.code,
-  skuName: sku.name,
-  quantity: undefined,
-  price: undefined,
-  totalPrice: undefined
-})
+function buildDetail(sku: ItemSkuVO): ReceiptOrderDetailVO {
+  return {
+    id: undefined,
+    itemId: sku.itemId,
+    itemCode: sku.itemCode,
+    itemName: sku.itemName,
+    unit: sku.unit,
+    skuId: sku.id,
+    skuCode: sku.code,
+    skuName: sku.name,
+    quantity: undefined,
+    price: undefined,
+    totalPrice: undefined
+  }
+}
 
-const normalizeDetails = (details: ReceiptOrderDetailVO[]) =>
-  details.map((detail) => ({
+function normalizeDetails(details: ReceiptOrderDetailVO[]) {
+  return details.map((detail) => ({
     ...detail,
     totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
+}
 
 /** 添加商品 */
 const handleAddDetail = () => {
@@ -354,9 +357,9 @@ const handleDetailTotalPriceChange = (detail: ReceiptOrderDetailVO) => {
   detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
-/** 明细合计 */
-const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ReceiptOrderDetailVO[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getDetailSummaries({ columns, data }: { columns: any[]; data: ReceiptOrderDetailVO[] }) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -371,6 +374,7 @@ const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ReceiptOr
     }
     return ''
   })
+}
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 91b9420e0..fae597e76 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -450,35 +450,43 @@ const checkedTableColumns = ref<TableColumnKey[]>([
   'operateInfo',
   'remark'
 ])
-const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
 const loading = ref(true) // 列表的加载中
 const list = ref<ReceiptOrderVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  no: undefined as string | undefined,
-  status: undefined as number | undefined,
-  warehouseId: undefined as number | undefined,
-  merchantId: undefined as number | undefined,
-  orderTime: undefined as string[] | undefined,
-  totalQuantityMin: undefined as number | undefined,
-  totalQuantityMax: undefined as number | undefined,
-  totalPriceMin: undefined as number | undefined,
-  totalPriceMax: undefined as number | undefined,
-  type: undefined as number | undefined,
-  bizOrderNo: undefined as string | undefined,
-  creator: undefined as number | undefined,
-  updater: undefined as number | undefined,
-  createTime: undefined as string[] | undefined,
-  updateTime: undefined as string[] | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    no: undefined as string | undefined,
+    status: undefined as number | undefined,
+    warehouseId: undefined as number | undefined,
+    merchantId: undefined as number | undefined,
+    orderTime: undefined as string[] | undefined,
+    totalQuantityMin: undefined as number | undefined,
+    totalQuantityMax: undefined as number | undefined,
+    totalPriceMin: undefined as number | undefined,
+    totalPriceMax: undefined as number | undefined,
+    type: undefined as number | undefined,
+    bizOrderNo: undefined as string | undefined,
+    creator: undefined as number | undefined,
+    updater: undefined as number | undefined,
+    createTime: undefined as string[] | undefined,
+    updateTime: undefined as string[] | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, ReceiptOrderDetailVO[]>>({}) // 入库单明细数据
 
+/** 判断表格列是否可见 */
+function isTableColumnVisible(column: TableColumnKey) {
+  return checkedTableColumns.value.includes(column)
+}
+
 /** 是否允许修改入库单 */
 const canUpdateReceiptOrder = (status?: number) => {
   return status !== undefined && OrderUpdateStatusList.includes(status)
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 42b75317f..efb33b983 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -127,8 +127,9 @@ const detailRows = computed<DetailRow[]>(() =>
   }))
 )
 
-const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] }) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -143,6 +144,7 @@ const getSummaries = ({ columns, data }: { columns: any[]; data: DetailRow[] })
     }
     return ''
   })
+}
 
 /** 打开弹窗 */
 const open = async (id: number) => {
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 490d209b5..e38f51785 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -293,28 +293,31 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 构建出库明细 */
-const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
-  id: undefined,
-  itemId: inventory.itemId,
-  itemCode: inventory.itemCode,
-  itemName: inventory.itemName,
-  unit: inventory.unit,
-  skuId: inventory.skuId,
-  skuCode: inventory.skuCode,
-  skuName: inventory.skuName,
-  warehouseId: inventory.warehouseId,
-  warehouseName: inventory.warehouseName,
-  quantity: undefined,
-  availableQuantity: inventory.availableQuantity,
-  price: undefined,
-  totalPrice: undefined
-})
+function buildDetail(inventory: InventorySelectRow): ShipmentOrderDetailVO {
+  return {
+    id: undefined,
+    itemId: inventory.itemId,
+    itemCode: inventory.itemCode,
+    itemName: inventory.itemName,
+    unit: inventory.unit,
+    skuId: inventory.skuId,
+    skuCode: inventory.skuCode,
+    skuName: inventory.skuName,
+    warehouseId: inventory.warehouseId,
+    warehouseName: inventory.warehouseName,
+    quantity: undefined,
+    availableQuantity: inventory.availableQuantity,
+    price: undefined,
+    totalPrice: undefined
+  }
+}
 
-const normalizeDetails = (details: ShipmentOrderDetailVO[]) =>
-  details.map((detail) => ({
+function normalizeDetails(details: ShipmentOrderDetailVO[]) {
+  return details.map((detail) => ({
     ...detail,
     totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
+}
 
 /** 添加商品 */
 const handleAddDetail = () => {
@@ -371,9 +374,9 @@ const handleDetailTotalPriceChange = (detail: ShipmentOrderDetailVO) => {
   detail.price = dividePrice(detail.totalPrice, detail.quantity)
 }
 
-/** 明细合计 */
-const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ShipmentOrderDetailVO[] }) =>
-  columns.map((column, index) => {
+/** 计算表格的合计行数据 */
+function getDetailSummaries({ columns, data }: { columns: any[]; data: ShipmentOrderDetailVO[] }) {
+  return columns.map((column, index) => {
     if (index === 0) {
       return '合计'
     }
@@ -388,6 +391,7 @@ const getDetailSummaries = ({ columns, data }: { columns: any[]; data: ShipmentO
     }
     return ''
   })
+}
 
 /** 校验明细 */
 const validateDetails = (required: boolean) => {
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 1adccf376..38beb0c83 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -450,35 +450,43 @@ const checkedTableColumns = ref<TableColumnKey[]>([
   'operateInfo',
   'remark'
 ])
-const isTableColumnVisible = (column: TableColumnKey) => checkedTableColumns.value.includes(column)
 
 const loading = ref(true) // 列表的加载中
 const list = ref<ShipmentOrderVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const getDefaultQueryParams = () => ({
-  pageNo: 1,
-  pageSize: 10,
-  no: undefined as string | undefined,
-  status: undefined as number | undefined,
-  warehouseId: undefined as number | undefined,
-  merchantId: undefined as number | undefined,
-  orderTime: undefined as string[] | undefined,
-  totalQuantityMin: undefined as number | undefined,
-  totalQuantityMax: undefined as number | undefined,
-  totalPriceMin: undefined as number | undefined,
-  totalPriceMax: undefined as number | undefined,
-  type: undefined as number | undefined,
-  bizOrderNo: undefined as string | undefined,
-  creator: undefined as number | undefined,
-  updater: undefined as number | undefined,
-  createTime: undefined as string[] | undefined,
-  updateTime: undefined as string[] | undefined
-})
+
+/** 获得默认的查询参数 */
+function getDefaultQueryParams() {
+  return {
+    pageNo: 1,
+    pageSize: 10,
+    no: undefined as string | undefined,
+    status: undefined as number | undefined,
+    warehouseId: undefined as number | undefined,
+    merchantId: undefined as number | undefined,
+    orderTime: undefined as string[] | undefined,
+    totalQuantityMin: undefined as number | undefined,
+    totalQuantityMax: undefined as number | undefined,
+    totalPriceMin: undefined as number | undefined,
+    totalPriceMax: undefined as number | undefined,
+    type: undefined as number | undefined,
+    bizOrderNo: undefined as string | undefined,
+    creator: undefined as number | undefined,
+    updater: undefined as number | undefined,
+    createTime: undefined as string[] | undefined,
+    updateTime: undefined as string[] | undefined
+  }
+}
 const queryParams = reactive(getDefaultQueryParams())
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const detailMap = reactive<Record<number, ShipmentOrderDetailVO[]>>({}) // 出库单明细数据
 
+/** 判断表格列是否可见 */
+function isTableColumnVisible(column: TableColumnKey) {
+  return checkedTableColumns.value.includes(column)
+}
+
 /** 是否允许修改出库单 */
 const canUpdateShipmentOrder = (status?: number) => {
   return status !== undefined && OrderUpdateStatusList.includes(status)
diff --git a/src/views/wms/utils/constants.ts b/src/views/wms/utils/constants.ts
index 771080aaa..a1aa38110 100644
--- a/src/views/wms/utils/constants.ts
+++ b/src/views/wms/utils/constants.ts
@@ -43,7 +43,7 @@ export const CustomerMerchantTypeList = [
  *
  * 由前端在表单【生成】按钮上调用，避免后端兜底生成造成编号不可控。
  */
-export const generateWmsCode = (prefix: string = ''): string => {
+export function generateWmsCode(prefix: string = ''): string {
   let result = ''
   for (let i = 0; i < 8; i++) {
     result += Math.floor(Math.random() * 10).toString()
diff --git a/src/views/wms/utils/format.ts b/src/views/wms/utils/format.ts
index f6a84575b..a946d86fd 100644
--- a/src/views/wms/utils/format.ts
+++ b/src/views/wms/utils/format.ts
@@ -15,7 +15,7 @@ export const WEIGHT_PRECISION = 3
 /** 长宽高小数位 */
 export const DIMENSION_PRECISION = 1
 
-const toFiniteDecimal = (value: DecimalValue) => {
+function toFiniteDecimal(value: DecimalValue) {
   if (isNullOrUnDef(value)) {
     return undefined
   }
@@ -29,7 +29,7 @@ const toFiniteDecimal = (value: DecimalValue) => {
   return decimalValue
 }
 
-const sumDecimal = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+function sumDecimal<T>(list: T[], getter: (item: T) => DecimalValue) {
   return list.reduce((sum, item) => {
     const decimalValue = toFiniteDecimal(getter(item))
     return decimalValue === undefined ? sum : sum + decimalValue
@@ -37,30 +37,30 @@ const sumDecimal = <T>(list: T[], getter: (item: T) => DecimalValue) => {
 }
 
 /** 格式化数量 */
-export const formatQuantity = (value?: number | string | null) => {
+export function formatQuantity(value?: number | string | null) {
   const decimalValue = toFiniteDecimal(value)
   return decimalValue === undefined ? '' : decimalValue.toFixed(QUANTITY_PRECISION)
 }
 
 /** 格式化金额 */
-export const formatPrice = (value?: number | string | null) => {
+export function formatPrice(value?: number | string | null) {
   const decimalValue = toFiniteDecimal(value)
   return decimalValue === undefined ? '' : decimalValue.toFixed(PRICE_PRECISION)
 }
 
 /** 金额四舍五入 */
-export const roundPrice = (value: number) => {
+export function roundPrice(value: number) {
   return Number.isFinite(value) ? Number(value.toFixed(PRICE_PRECISION)) : undefined
 }
 
 /** 亏损数字样式 */
-export const getLossClass = (value?: number | string | null) => {
+export function getLossClass(value?: number | string | null) {
   const decimalValue = toFiniteDecimal(value)
   return decimalValue !== undefined && decimalValue < 0 ? 'text-red-500' : ''
 }
 
 /** 数量 * 单价，计算金额 */
-export const multiplyPrice = (quantity?: number, price?: number) => {
+export function multiplyPrice(quantity?: number, price?: number) {
   if (quantity === undefined || quantity === null || price === undefined || price === null) {
     return undefined
   }
@@ -68,7 +68,7 @@ export const multiplyPrice = (quantity?: number, price?: number) => {
 }
 
 /** 金额 / 数量，反算单价 */
-export const dividePrice = (totalPrice?: number, quantity?: number) => {
+export function dividePrice(totalPrice?: number, quantity?: number) {
   if (totalPrice === undefined || totalPrice === null || !quantity) {
     return undefined
   }
@@ -76,43 +76,43 @@ export const dividePrice = (totalPrice?: number, quantity?: number) => {
 }
 
 /** 汇总数量 */
-export const sumQuantity = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+export function sumQuantity<T>(list: T[], getter: (item: T) => DecimalValue) {
   return sumDecimal(list, getter)
 }
 
 /** 汇总金额 */
-export const sumPrice = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+export function sumPrice<T>(list: T[], getter: (item: T) => DecimalValue) {
   return sumDecimal(list, getter)
 }
 
 /** 格式化汇总数量 */
-export const formatSumQuantity = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+export function formatSumQuantity<T>(list: T[], getter: (item: T) => DecimalValue) {
   return formatQuantity(sumQuantity(list, getter))
 }
 
 /** 格式化汇总金额 */
-export const formatSumPrice = <T>(list: T[], getter: (item: T) => DecimalValue) => {
+export function formatSumPrice<T>(list: T[], getter: (item: T) => DecimalValue) {
   return formatPrice(sumPrice(list, getter))
 }
 
 /** 格式化重量 */
-export const formatWeight = (value?: number | string | null) => {
+export function formatWeight(value?: number | string | null) {
   const decimalValue = toFiniteDecimal(value)
   return decimalValue === undefined ? '' : decimalValue.toFixed(WEIGHT_PRECISION)
 }
 
 /** 格式化长宽高 */
-export const formatDimension = (value?: number | string | null) => {
+export function formatDimension(value?: number | string | null) {
   const decimalValue = toFiniteDecimal(value)
   return decimalValue === undefined ? '' : decimalValue.toFixed(DIMENSION_PRECISION)
 }
 
 /** 格式化长宽高组合 */
-export const formatDimensionText = (
+export function formatDimensionText(
   length?: number | string | null,
   width?: number | string | null,
   height?: number | string | null
-) => {
+) {
   if (!isNullOrUnDef(length) && !isNullOrUnDef(width) && !isNullOrUnDef(height)) {
     return [formatDimension(length), formatDimension(width), formatDimension(height)].join(' * ')
   }
diff --git a/src/views/wms/utils/order.ts b/src/views/wms/utils/order.ts
index ed4671647..356413609 100644
--- a/src/views/wms/utils/order.ts
+++ b/src/views/wms/utils/order.ts
@@ -3,7 +3,7 @@
  */
 
 /** 生成业务单号：前缀 + 月日 + 4 位随机数 */
-export const generateOrderNo = (prefix: string) => {
+export function generateOrderNo(prefix: string) {
   const now = new Date()
   const month = String(now.getMonth() + 1).padStart(2, '0')
   const day = String(now.getDate()).padStart(2, '0')

From 508d06b4935213910b285ee656c4381d84c05b83 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 13:09:30 +0800
Subject: [PATCH 39/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/receipt/ReceiptOrderPrint.vue | 15 ++++++++++++++-
 .../wms/order/shipment/ShipmentOrderPrint.vue     | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index f79ebe8ea..c34b7e5d2 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -3,7 +3,18 @@
   <div class="hidden">
     <button ref="printButtonRef" v-print="printObj" type="button"></button>
     <div id="wmsReceiptOrderPrint" class="color-#303133">
-      <h2 class="text-center">入库单</h2>
+      <div class="relative mb-8px">
+        <h2 class="text-center">入库单</h2>
+        <div v-if="printData.no" class="absolute right-0 top-0">
+          <Barcode
+            :content="printData.no"
+            :display-value="false"
+            :format="BarcodeFormatEnum.CODE39"
+            :height="40"
+            :width="180"
+          />
+        </div>
+      </div>
       <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
         <div>入库单号：{{ printData.no || '-' }}</div>
         <div>
@@ -86,6 +97,8 @@ import {
   formatSumPrice,
   formatSumQuantity
 } from '@/views/wms/utils/format'
+import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
+import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
 
 /** WMS 入库单打印 */
 defineOptions({ name: 'WmsReceiptOrderPrint' })
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 7ebd36feb..c8f9f5231 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -3,7 +3,18 @@
   <div class="hidden">
     <button ref="printButtonRef" v-print="printObj" type="button"></button>
     <div id="wmsShipmentOrderPrint" class="color-#303133">
-      <h2 class="text-center">出库单</h2>
+      <div class="relative mb-8px">
+        <h2 class="text-center">出库单</h2>
+        <div v-if="printData.no" class="absolute right-0 top-0">
+          <Barcode
+            :content="printData.no"
+            :display-value="false"
+            :format="BarcodeFormatEnum.CODE39"
+            :height="40"
+            :width="180"
+          />
+        </div>
+      </div>
       <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
         <div>出库单号：{{ printData.no || '-' }}</div>
         <div>
@@ -86,6 +97,8 @@ import {
   formatSumPrice,
   formatSumQuantity
 } from '@/views/wms/utils/format'
+import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
+import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
 
 /** WMS 出库单打印 */
 defineOptions({ name: 'WmsShipmentOrderPrint' })

From 524ed289734dff204dc8bebc1190546e16d3ca6f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 13:12:23 +0800
Subject: [PATCH 40/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E7=9A=84=20barcode=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/check/CheckOrderPrint.vue | 15 ++++++++++++++-
 src/views/wms/order/movement/index.vue        | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index f65e1deaf..723052ee6 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -3,7 +3,18 @@
   <div class="hidden">
     <button ref="printButtonRef" v-print="printObj" type="button"></button>
     <div id="wmsCheckOrderPrint" class="color-#303133">
-      <h2 class="text-center">盘库单</h2>
+      <div class="relative mb-8px">
+        <h2 class="text-center">盘库单</h2>
+        <div v-if="printData.no" class="absolute right-0 top-0">
+          <Barcode
+            :content="printData.no"
+            :display-value="false"
+            :format="BarcodeFormatEnum.CODE39"
+            :height="40"
+            :width="180"
+          />
+        </div>
+      </div>
       <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
         <div>盘库单号：{{ printData.no || '-' }}</div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
@@ -118,6 +129,8 @@ import { formatNullableDate } from '@/utils/formatTime'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
 import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
+import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
+import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
 import {
   formatPrice,
   formatQuantity,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 59141e418..d77b49751 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -327,6 +327,14 @@
               </el-button>
             </span>
           </el-tooltip>
+          <el-button
+            v-hasPermi="['wms:movement-order:query']"
+            link
+            type="primary"
+            @click="handlePrint(scope.row.id)"
+          >
+            打印
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -342,6 +350,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <MovementOrderForm ref="formRef" @success="getList" />
   <MovementOrderDetail ref="detailRef" />
+  <MovementOrderPrint ref="printRef" />
 </template>
 
 <script lang="ts" setup>
@@ -364,6 +373,7 @@ import {
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import MovementOrderDetail from './MovementOrderDetail.vue'
 import MovementOrderForm from './MovementOrderForm.vue'
+import MovementOrderPrint from './MovementOrderPrint.vue'
 import download from '@/utils/download'
 
 /** WMS 移库单 */
@@ -516,6 +526,12 @@ const openDetail = (id: number) => {
   detailRef.value.open(id)
 }
 
+/** 打印移库单 */
+const printRef = ref()
+const handlePrint = (id: number) => {
+  printRef.value.print(id)
+}
+
 /** 删除移库单 */
 const handleDelete = async (id: number) => {
   try {

From 2ffbcbd71f114b47bfb30cd118142d3b931c91ff Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 13:25:56 +0800
Subject: [PATCH 41/46] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E4=BF=A1=E6=81=AF=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/check/CheckOrderPrint.vue       | 11 ++++++++++-
 src/views/wms/order/receipt/ReceiptOrderPrint.vue   | 11 ++++++++++-
 src/views/wms/order/shipment/ShipmentOrderPrint.vue | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index 723052ee6..0cc70a71a 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -32,7 +32,16 @@
             {{ formatPrice(getOrderDifferencePrice(printData)) || '-' }}
           </span>
         </div>
-        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
+        <div class="col-span-3 grid grid-cols-2 gap-x-24px">
+          <div>
+            创建：{{ formatNullableDate(printData.createTime) }} /
+            {{ printData.creatorName || printData.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(printData.updateTime) }} /
+            {{ printData.updaterName || printData.updater || '-' }}
+          </div>
+        </div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
       <table class="w-full border-collapse text-13px">
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index c34b7e5d2..77b380316 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -27,7 +27,16 @@
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
-        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
+        <div class="col-span-3 grid grid-cols-2 gap-x-24px">
+          <div>
+            创建：{{ formatNullableDate(printData.createTime) }} /
+            {{ printData.creatorName || printData.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(printData.updateTime) }} /
+            {{ printData.updaterName || printData.updater || '-' }}
+          </div>
+        </div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
       <table class="w-full border-collapse text-13px">
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index c8f9f5231..0b86df8a7 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -27,7 +27,16 @@
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
         <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
-        <div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
+        <div class="col-span-3 grid grid-cols-2 gap-x-24px">
+          <div>
+            创建：{{ formatNullableDate(printData.createTime) }} /
+            {{ printData.creatorName || printData.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(printData.updateTime) }} /
+            {{ printData.updaterName || printData.updater || '-' }}
+          </div>
+        </div>
         <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
       </div>
       <table class="w-full border-collapse text-13px">

From fa570c263717b87d7f3ea6a67398915e3231cb7c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 14:11:14 +0800
Subject: [PATCH 42/46] =?UTF-8?q?feat(wms):=20=E6=8C=81=E4=B9=85=E5=8C=96?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=A7=BB=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=8C=E9=87=91=E9=A2=9D=E5=B9=B6=E8=A1=A5=E5=85=A8=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B5=81=E6=B0=B4=E9=87=91=E9=A2=9D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventory/history/index.ts        |   1 +
 src/views/wms/inventory/history/index.vue     |   6 +-
 .../order/movement/MovementOrderDetail.vue    |   5 +-
 .../wms/order/movement/MovementOrderForm.vue  |   2 +-
 .../wms/order/movement/MovementOrderPrint.vue | 144 ++++++++++++++++++
 src/views/wms/order/movement/index.vue        |   3 +
 .../wms/order/receipt/ReceiptOrderDetail.vue  |   5 +-
 .../wms/order/receipt/ReceiptOrderForm.vue    |   2 +-
 .../wms/order/receipt/ReceiptOrderPrint.vue   |   5 +-
 src/views/wms/order/receipt/index.vue         |   3 +
 .../order/shipment/ShipmentOrderDetail.vue    |   5 +-
 .../wms/order/shipment/ShipmentOrderForm.vue  |   2 +-
 .../wms/order/shipment/ShipmentOrderPrint.vue |   5 +-
 src/views/wms/order/shipment/index.vue        |   3 +
 14 files changed, 177 insertions(+), 14 deletions(-)
 create mode 100644 src/views/wms/order/movement/MovementOrderPrint.vue

diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
index 76345ae99..a0ce1d1da 100644
--- a/src/api/wms/inventory/history/index.ts
+++ b/src/api/wms/inventory/history/index.ts
@@ -16,6 +16,7 @@ export interface InventoryHistoryVO {
   beforeQuantity?: number
   afterQuantity?: number
   price?: number
+  totalPrice?: number
   remark?: string
   orderId?: number
   orderNo?: string
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index e67855c39..b85e12e7d 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -144,7 +144,7 @@
           {{ formatQuantity(scope.row.afterQuantity) || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="数量/单价(元)" min-width="150">
+      <el-table-column label="数量/金额(元)" min-width="150">
         <template #default="scope">
           <div class="flex justify-between">
             <span>数量：</span>
@@ -154,6 +154,10 @@
             <span>单价：</span>
             <span>{{ formatPrice(scope.row.price) }}</span>
           </div>
+          <div v-if="scope.row.totalPrice || scope.row.totalPrice === 0" class="flex justify-between">
+            <span>金额：</span>
+            <span>{{ formatPrice(scope.row.totalPrice) }}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 6644cb44a..156cd7970 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -104,9 +104,10 @@ const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
     totalPrice:
-      detail.price != null && detail.quantity
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
         ? Number(detail.price) * Number(detail.quantity)
-        : undefined
+        : undefined)
   }))
 )
 
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index f672b22bf..605998fe1 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -430,7 +430,7 @@ const buildSubmitData = () => {
   } = formData.value
   return {
     ...order,
-    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+    details: details || []
   } as MovementOrderVO
 }
 
diff --git a/src/views/wms/order/movement/MovementOrderPrint.vue b/src/views/wms/order/movement/MovementOrderPrint.vue
new file mode 100644
index 000000000..048a2224a
--- /dev/null
+++ b/src/views/wms/order/movement/MovementOrderPrint.vue
@@ -0,0 +1,144 @@
+<!-- WMS 移库单打印 -->
+<template>
+  <div class="hidden">
+    <button ref="printButtonRef" v-print="printObj" type="button"></button>
+    <div id="wmsMovementOrderPrint" class="color-#303133">
+      <div class="relative mb-8px">
+        <h2 class="text-center">移库单</h2>
+        <div v-if="printData.no" class="absolute right-0 top-0">
+          <Barcode
+            :content="printData.no"
+            :display-value="false"
+            :format="BarcodeFormatEnum.CODE39"
+            :height="40"
+            :width="180"
+          />
+        </div>
+      </div>
+      <div class="mb-12px grid grid-cols-3 gap-x-24px gap-y-8px text-14px">
+        <div>移库单号：{{ printData.no || '-' }}</div>
+        <div>来源仓库：{{ printData.sourceWarehouseName || '-' }}</div>
+        <div>目标仓库:{{ printData.targetWarehouseName || '-' }}</div>
+        <div>移库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
+        <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
+        <div>总金额：{{ formatPrice(printData.totalPrice) || '-' }}</div>
+        <div class="col-span-3 grid grid-cols-2 gap-x-24px">
+          <div>
+            创建：{{ formatNullableDate(printData.createTime) }} /
+            {{ printData.creatorName || printData.creator || '-' }}
+          </div>
+          <div>
+            更新：{{ formatNullableDate(printData.updateTime) }} /
+            {{ printData.updaterName || printData.updater || '-' }}
+          </div>
+        </div>
+        <div class="col-span-3">备注：{{ printData.remark || '-' }}</div>
+      </div>
+      <table class="w-full border-collapse text-13px">
+        <thead>
+          <tr>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">商品信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">单价(元)</th>
+            <th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="detail in printRows" :key="detail.id">
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.itemName || '-' }}</div>
+              <div v-if="detail.itemCode" class="text-12px">编号：{{ detail.itemCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px">
+              <div>{{ detail.skuName || '-' }}</div>
+              <div v-if="detail.skuCode" class="text-12px">编号：{{ detail.skuCode }}</div>
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatQuantity(detail.quantity) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.price) || '-' }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 p-8px text-right">
+              {{ formatPrice(detail.totalPrice) || '-' }}
+            </td>
+          </tr>
+          <tr v-if="printRows.length">
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px" colspan="2">合计</td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.price) }}
+            </td>
+            <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
+              {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}
+            </td>
+          </tr>
+          <tr v-if="!printRows.length">
+            <td
+              class="border border-solid border-#dcdfe6 p-8px text-center"
+              :colspan="tableColumnCount"
+            >
+              暂无明细
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { formatNullableDate } from '@/utils/formatTime'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
+import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
+import {
+  formatPrice,
+  formatQuantity,
+  formatSumPrice,
+  formatSumQuantity
+} from '@/views/wms/utils/format'
+import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
+import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
+
+/** WMS 移库单打印 */
+defineOptions({ name: 'WmsMovementOrderPrint' })
+
+const printData = ref<MovementOrderVO>({}) // 打印数据
+const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
+const tableColumnCount = 5
+const printObj = ref({
+  id: 'wmsMovementOrderPrint',
+  popTitle: '&nbsp',
+  extraCss: '/print.css',
+  extraHead: '',
+  zIndex: 20003
+})
+
+interface PrintRow extends MovementOrderDetailVO {
+  totalPrice?: number
+}
+
+const printRows = computed<PrintRow[]>(() =>
+  (printData.value.details || []).map((detail) => ({
+    ...detail,
+    totalPrice:
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
+        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
+        : undefined)
+  }))
+)
+
+/** 打印移库单 */
+const print = async (id: number) => {
+  printData.value = await MovementOrderApi.getMovementOrder(id)
+  await nextTick()
+  printButtonRef.value?.click()
+}
+defineExpose({ print })
+</script>
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index d77b49751..c26a2f2f5 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -499,6 +499,9 @@ const resetQuery = () => {
 
 /** 计算明细金额 */
 const getDetailTotalPrice = (detail: MovementOrderDetailVO) => {
+  if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
+    return detail.totalPrice
+  }
   if (!detail.quantity || detail.price === undefined || detail.price === null) {
     return undefined
   }
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 453976be5..28e63e49b 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -121,9 +121,10 @@ const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
     totalPrice:
-      detail.price != null && detail.quantity
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
         ? Number(detail.price) * Number(detail.quantity)
-        : undefined
+        : undefined)
   }))
 )
 
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index de92a22ff..746c320a8 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -409,7 +409,7 @@ const buildSubmitData = () => {
   } = formData.value
   return {
     ...order,
-    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+    details: details || []
   } as ReceiptOrderVO
 }
 
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 77b380316..af12d4414 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -131,9 +131,10 @@ const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => ({
     ...detail,
     totalPrice:
-      detail.price != null && detail.quantity
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
         ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
-        : undefined
+        : undefined)
   }))
 )
 
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index fae597e76..879933968 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -547,6 +547,9 @@ const handleWarehouseChange = () => {
 
 /** 计算明细金额 */
 const getDetailTotalPrice = (detail: ReceiptOrderDetailVO) => {
+  if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
+    return detail.totalPrice
+  }
   if (!detail.quantity || detail.price === undefined || detail.price === null) {
     return undefined
   }
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index efb33b983..59d1d5b7a 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -121,9 +121,10 @@ const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
     totalPrice:
-      detail.price != null && detail.quantity
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
         ? Number(detail.price) * Number(detail.quantity)
-        : undefined
+        : undefined)
   }))
 )
 
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index e38f51785..caff9950d 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -430,7 +430,7 @@ const buildSubmitData = () => {
   } = formData.value
   return {
     ...order,
-    details: (details || []).map(({ totalPrice: _rowTotalPrice, ...detail }) => detail)
+    details: details || []
   } as ShipmentOrderVO
 }
 
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 0b86df8a7..7f2b43fca 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -131,9 +131,10 @@ const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => ({
     ...detail,
     totalPrice:
-      detail.price != null && detail.quantity
+      detail.totalPrice ??
+      (detail.price != null && detail.quantity
         ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
-        : undefined
+        : undefined)
   }))
 )
 
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 38beb0c83..ea672ab4a 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -547,6 +547,9 @@ const handleWarehouseChange = () => {
 
 /** 计算明细金额 */
 const getDetailTotalPrice = (detail: ShipmentOrderDetailVO) => {
+  if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
+    return detail.totalPrice
+  }
   if (!detail.quantity || detail.price === undefined || detail.price === null) {
     return undefined
   }

From c81116678ab3038f9c9ac591a777f8d35b37793e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 18:23:59 +0800
Subject: [PATCH 43/46] =?UTF-8?q?feat(wms):=20=E6=8B=86=20simple-list=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20VO=E3=80=81=E8=A1=A5=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8E=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后端：
- 新增 WmsItemListReqVO / WmsMerchantListReqVO，simple-list 接口不再
  复用分页 PageReqVO，Swagger 上不再误暴露 pageNo/pageSize 字段
- WmsItemController / WmsMerchantController 的 getXxxSimpleList 改用
  独立 ListReqVO；Mapper.selectList、Service.getXxxList 同步调整签名
- WmsHomeStatisticsServiceImpl 三个查询入口加 validateWarehouseIfPresent，
  非空 warehouseId 走 warehouseService.validateWarehouseExists 校验，
  避免前端误传任意 id 直接落到首页 SQL
- 新增 sql/mysql/wms/20260515_wms_total_price.sql：幂等给 4 张明细 / 流水表
  补 total_price 列并按 ROUND(quantity*price, 2) 回填历史数据

前端：
- receipt/index.vue + shipment/index.vue 搜索栏补 bizOrderNo 输入控件，
  对齐已声明的 queryParams 与后端 PageReqVO 支持
- WmsHomeOrderSummaryCards.getStatusPercent 改 function 声明，并去掉
  最小 4% 占比下限，保留真实比例
---
 .../wms/home/components/WmsHomeOrderSummaryCards.vue     | 4 ++--
 src/views/wms/order/receipt/index.vue                    | 9 +++++++++
 src/views/wms/order/shipment/index.vue                   | 9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
index 23af97527..32b3ef580 100644
--- a/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
+++ b/src/views/wms/home/components/WmsHomeOrderSummaryCards.vue
@@ -204,12 +204,12 @@ const handleNavigate = async (name: string) => {
 }
 
 /** 计算状态进度条占比 */
-const getStatusPercent = (item: OrderSummaryItem, status: number) => {
+function getStatusPercent(item: OrderSummaryItem, status: number) {
   const count = item.statusCounts[status] || 0
   if (!item.total || !count) {
     return '0%'
   }
-  return `${Math.max((count / item.total) * 100, 4)}%`
+  return `${(count / item.total) * 100}%`
 }
 
 /** 格式化单据数量 */
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 879933968..346248850 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -18,6 +18,15 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="业务单号" prop="bizOrderNo">
+        <el-input
+          v-model="queryParams.bizOrderNo"
+          class="!w-240px"
+          clearable
+          placeholder="请输入业务单号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="单据状态" prop="status">
         <el-select
           v-model="queryParams.status"
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index ea672ab4a..d92605d82 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -18,6 +18,15 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="业务单号" prop="bizOrderNo">
+        <el-input
+          v-model="queryParams.bizOrderNo"
+          class="!w-240px"
+          clearable
+          placeholder="请输入业务单号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="单据状态" prop="status">
         <el-select
           v-model="queryParams.status"

From 50cfbfe58bd0cbfa6912c3f40f80e49b5a067c89 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 18:52:37 +0800
Subject: [PATCH 44/46] =?UTF-8?q?feat(wms):=20=E7=BB=9F=E4=B8=80=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=87=91=E9=A2=9D=E7=B2=BE=E5=BA=A6=E5=B9=B6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=20schema=20=E8=84=B1=E9=92=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后端：
- 新增 sql/mysql/wms/20260515_wms_amount_precision.sql
  11 张表金额字段统一升到 decimal(16,2)，覆盖 SKU 单价、单据主表/明细
  总金额/行金额、盘库实际金额、库存流水单价/行金额
- 新增 sql/mysql/wms/20260515_wms_sku_dimension_precision.sql
  SKU 长宽高对齐 lite 改为 decimal(10,1)、毛/净重改为 decimal(10,3)
- 测试 SQL create_tables.sql 全量同步生产 MySQL：数量 (20,2)、
  金额 (16,2)、长度 (10,1)、重量 (10,3)，修复"测试 schema 与生产
  脱钩"导致单测假阳性的隐患
- WmsWarehouseServiceImpl.validateWarehouseCodeUnique 去掉
  StrUtil.isBlank 提前 return，因 code 已由 VO 层 @NotBlank 强制非空
- WmsWarehouseServiceImplTest 同步调整

前端：
- ReceiptOrderForm / ReceiptOrderDetail 合计行去掉"单价合计"派生展示，
  单价不能跨行相加；保留数量合计与行金额合计

文档：
- review-opus.md 收口至仅剩 F10 (SQL 导出，用户认领)
- 新增 fix-plan.md 与 精度调整-codex讨论.md，沉淀本轮决策依据
---
 src/views/wms/order/check/CheckOrderPrint.vue        |  1 -
 src/views/wms/order/movement/MovementOrderDetail.vue |  3 ---
 src/views/wms/order/movement/MovementOrderForm.vue   | 10 +---------
 src/views/wms/order/movement/MovementOrderPrint.vue  |  1 -
 src/views/wms/order/receipt/ReceiptOrderDetail.vue   |  3 ---
 src/views/wms/order/receipt/ReceiptOrderForm.vue     | 10 +---------
 src/views/wms/order/receipt/ReceiptOrderPrint.vue    |  1 -
 src/views/wms/order/shipment/ShipmentOrderDetail.vue |  3 ---
 src/views/wms/order/shipment/ShipmentOrderForm.vue   | 10 +---------
 src/views/wms/order/shipment/ShipmentOrderPrint.vue  |  1 -
 10 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/order/check/CheckOrderPrint.vue b/src/views/wms/order/check/CheckOrderPrint.vue
index 0cc70a71a..de0effcf7 100644
--- a/src/views/wms/order/check/CheckOrderPrint.vue
+++ b/src/views/wms/order/check/CheckOrderPrint.vue
@@ -100,7 +100,6 @@
               {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
-              {{ formatSumPrice(printRows, (detail) => detail.price) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
               {{ formatSumQuantity(printRows, (detail) => detail.checkQuantity) }}
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 156cd7970..82a1a94f9 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -120,9 +120,6 @@ function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] })
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatSumPrice(data, (detail) => detail.price)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 605998fe1..c3031f94b 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -200,14 +200,12 @@ import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   dividePrice,
-  formatPrice,
   formatQuantity,
   formatSumPrice,
   formatSumQuantity,
   multiplyPrice,
   PRICE_PRECISION,
-  QUANTITY_PRECISION,
-  sumPrice
+  QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
@@ -241,9 +239,6 @@ const formRules = reactive<FormRules>({
 const formRef = ref()
 const inventorySelectRef = ref()
 
-const detailPriceSum = computed(() =>
-  sumPrice(formData.value.details || [], (detail) => detail.price)
-)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -383,9 +378,6 @@ function getDetailSummaries({
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatPrice(detailPriceSum.value)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/movement/MovementOrderPrint.vue b/src/views/wms/order/movement/MovementOrderPrint.vue
index 048a2224a..37428260f 100644
--- a/src/views/wms/order/movement/MovementOrderPrint.vue
+++ b/src/views/wms/order/movement/MovementOrderPrint.vue
@@ -71,7 +71,6 @@
               {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
-              {{ formatSumPrice(printRows, (detail) => detail.price) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
               {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 28e63e49b..af9cd4b0d 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -137,9 +137,6 @@ function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] })
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatSumPrice(data, (detail) => detail.price)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index 746c320a8..27b205a7b 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -201,13 +201,11 @@ import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   dividePrice,
-  formatPrice,
   formatSumPrice,
   formatSumQuantity,
   multiplyPrice,
   PRICE_PRECISION,
-  QUANTITY_PRECISION,
-  sumPrice
+  QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
@@ -243,9 +241,6 @@ const formRules = reactive<FormRules>({
 const formRef = ref() // 表单 Ref
 const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
 
-const detailPriceSum = computed(() =>
-  sumPrice(formData.value.details || [], (detail) => detail.price)
-)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -366,9 +361,6 @@ function getDetailSummaries({ columns, data }: { columns: any[]; data: ReceiptOr
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatPrice(detailPriceSum.value)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index af12d4414..f2fd41ebd 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -75,7 +75,6 @@
               {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
-              {{ formatSumPrice(printRows, (detail) => detail.price) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
               {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 59d1d5b7a..7c2c81cdb 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -137,9 +137,6 @@ function getSummaries({ columns, data }: { columns: any[]; data: DetailRow[] })
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatSumPrice(data, (detail) => detail.price)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index caff9950d..af60c618c 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -211,14 +211,12 @@ import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect
 import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
 import {
   dividePrice,
-  formatPrice,
   formatQuantity,
   formatSumPrice,
   formatSumQuantity,
   multiplyPrice,
   PRICE_PRECISION,
-  QUANTITY_PRECISION,
-  sumPrice
+  QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
 import { generateOrderNo } from '@/views/wms/utils/order'
 
@@ -254,9 +252,6 @@ const formRules = reactive<FormRules>({
 const formRef = ref() // 表单 Ref
 const inventorySelectRef = ref() // 库存选择弹窗 Ref
 
-const detailPriceSum = computed(() =>
-  sumPrice(formData.value.details || [], (detail) => detail.price)
-)
 const isPrepareOrder = computed(
   () =>
     !formData.value.id ||
@@ -383,9 +378,6 @@ function getDetailSummaries({ columns, data }: { columns: any[]; data: ShipmentO
     if (column.property === 'quantity') {
       return formatSumQuantity(data, (detail) => detail.quantity)
     }
-    if (column.property === 'price') {
-      return formatPrice(detailPriceSum.value)
-    }
     if (column.property === 'totalPrice') {
       return formatSumPrice(data, (detail) => detail.totalPrice)
     }
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 7f2b43fca..9db1d0f17 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -75,7 +75,6 @@
               {{ formatSumQuantity(printRows, (detail) => detail.quantity) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
-              {{ formatSumPrice(printRows, (detail) => detail.price) }}
             </td>
             <td class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-right">
               {{ formatSumPrice(printRows, (detail) => detail.totalPrice) }}

From b3bb1114bafde1f8707e4934c017280436fb7216 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 19:48:33 +0800
Subject: [PATCH 45/46] =?UTF-8?q?fix(wms):=20=E5=AE=8C=E5=96=84=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8A=A4=E4=B8=8E=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=B2=BE=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 后端补充商品、往来企业唯一性校验
- 单据更新改为按草稿状态条件更新，避免覆盖已完成单据
- 补充 WMS 金额、规格精度迁移 SQL 与测试表结构
- 前端统一明细金额兜底计算，优化完成/作废取消处理
---
 src/views/wms/order/check/CheckOrderForm.vue         | 4 ++++
 src/views/wms/order/movement/MovementOrderDetail.vue | 9 +++------
 src/views/wms/order/movement/MovementOrderForm.vue   | 4 ++++
 src/views/wms/order/movement/index.vue               | 6 ++----
 src/views/wms/order/receipt/ReceiptOrderDetail.vue   | 9 +++------
 src/views/wms/order/receipt/ReceiptOrderPrint.vue    | 9 +++------
 src/views/wms/order/receipt/index.vue                | 6 ++----
 src/views/wms/order/shipment/ShipmentOrderDetail.vue | 9 +++------
 src/views/wms/order/shipment/ShipmentOrderPrint.vue  | 9 +++------
 src/views/wms/order/shipment/index.vue               | 6 ++----
 10 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 2e3fa6bb7..fbc184c48 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -628,6 +628,8 @@ const handleComplete = async () => {
     message.success('盘库成功')
     dialogVisible.value = false
     emit('success')
+  } catch {
+    // 用户点击确认框取消按钮、或网络异常时跳过
   } finally {
     formLoading.value = false
   }
@@ -642,6 +644,8 @@ const handleCancel = async () => {
     message.success('作废成功')
     dialogVisible.value = false
     emit('success')
+  } catch {
+    // 用户点击确认框取消按钮、或网络异常时跳过
   } finally {
     formLoading.value = false
   }
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 82a1a94f9..c8905eb5a 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -86,7 +86,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 
 /** WMS 移库单详情 */
@@ -103,11 +104,7 @@ interface DetailRow extends MovementOrderDetailVO {
 const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number(detail.price) * Number(detail.quantity)
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )
 
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index c3031f94b..3695f7a45 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -466,6 +466,8 @@ const handleComplete = async () => {
     message.success('移库成功')
     dialogVisible.value = false
     emit('success')
+  } catch {
+    // 用户点击确认框取消按钮、或网络异常时跳过
   } finally {
     formLoading.value = false
   }
@@ -480,6 +482,8 @@ const handleCancel = async () => {
     message.success('作废成功')
     dialogVisible.value = false
     emit('success')
+  } catch {
+    // 用户点击确认框取消按钮、或网络异常时跳过
   } finally {
     formLoading.value = false
   }
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index c26a2f2f5..9aad7c83f 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -367,6 +367,7 @@ import {
 import {
   formatPrice,
   formatQuantity,
+  multiplyPrice,
   PRICE_PRECISION,
   QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
@@ -502,10 +503,7 @@ const getDetailTotalPrice = (detail: MovementOrderDetailVO) => {
   if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
     return detail.totalPrice
   }
-  if (!detail.quantity || detail.price === undefined || detail.price === null) {
-    return undefined
-  }
-  return Number(detail.quantity) * Number(detail.price)
+  return multiplyPrice(detail.quantity, detail.price)
 }
 
 /** 展开明细 */
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index af9cd4b0d..e668f32f7 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -104,7 +104,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 
 /** WMS 入库单详情 */
@@ -120,11 +121,7 @@ const detailData = ref<ReceiptOrderVO>({}) // 详情数据
 const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number(detail.price) * Number(detail.quantity)
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )
 
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index f2fd41ebd..d4c7d96f2 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -103,7 +103,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
 import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
@@ -129,11 +130,7 @@ interface PrintRow extends ReceiptOrderDetailVO {
 const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )
 
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 346248850..657fe4dbd 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -414,6 +414,7 @@ import {
 import {
   formatPrice,
   formatQuantity,
+  multiplyPrice,
   PRICE_PRECISION,
   QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
@@ -559,10 +560,7 @@ const getDetailTotalPrice = (detail: ReceiptOrderDetailVO) => {
   if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
     return detail.totalPrice
   }
-  if (!detail.quantity || detail.price === undefined || detail.price === null) {
-    return undefined
-  }
-  return Number(detail.quantity) * Number(detail.price)
+  return multiplyPrice(detail.quantity, detail.price)
 }
 
 /** 展开明细 */
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 7c2c81cdb..dc490a355 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -104,7 +104,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 
 /** WMS 出库单详情 */
@@ -120,11 +121,7 @@ const detailData = ref<ShipmentOrderVO>({}) // 详情数据
 const detailRows = computed<DetailRow[]>(() =>
   (detailData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number(detail.price) * Number(detail.quantity)
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )
 
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 9db1d0f17..dd9c06c03 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -103,7 +103,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
 import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
@@ -129,11 +130,7 @@ interface PrintRow extends ShipmentOrderDetailVO {
 const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )
 
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index d92605d82..99be459bd 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -414,6 +414,7 @@ import {
 import {
   formatPrice,
   formatQuantity,
+  multiplyPrice,
   PRICE_PRECISION,
   QUANTITY_PRECISION
 } from '@/views/wms/utils/format'
@@ -559,10 +560,7 @@ const getDetailTotalPrice = (detail: ShipmentOrderDetailVO) => {
   if (detail.totalPrice !== undefined && detail.totalPrice !== null) {
     return detail.totalPrice
   }
-  if (!detail.quantity || detail.price === undefined || detail.price === null) {
-    return undefined
-  }
-  return Number(detail.quantity) * Number(detail.price)
+  return multiplyPrice(detail.quantity, detail.price)
 }
 
 /** 展开明细 */

From a18c81511c3f039ecc7feb71f0e137c8035fcfac Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 15 May 2026 19:59:45 +0800
Subject: [PATCH 46/46] =?UTF-8?q?fix(wms):=20=E5=AE=8C=E5=96=84=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8A=A4=E4=B8=8E=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=B2=BE=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 后端补充商品、往来企业唯一性校验
- 单据更新改为按草稿状态条件更新，避免覆盖已完成单据
- 补充 WMS 金额、规格精度迁移 SQL 与测试表结构
- 前端统一明细金额兜底计算，优化完成/作废取消处理
---
 src/views/wms/order/movement/MovementOrderPrint.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/order/movement/MovementOrderPrint.vue b/src/views/wms/order/movement/MovementOrderPrint.vue
index 37428260f..8a4c50275 100644
--- a/src/views/wms/order/movement/MovementOrderPrint.vue
+++ b/src/views/wms/order/movement/MovementOrderPrint.vue
@@ -99,7 +99,8 @@ import {
   formatPrice,
   formatQuantity,
   formatSumPrice,
-  formatSumQuantity
+  formatSumQuantity,
+  multiplyPrice
 } from '@/views/wms/utils/format'
 import Barcode from '@/views/mes/wm/barcode/components/Barcode.vue'
 import { BarcodeFormatEnum } from '@/views/mes/utils/constants'
@@ -125,11 +126,7 @@ interface PrintRow extends MovementOrderDetailVO {
 const printRows = computed<PrintRow[]>(() =>
   (printData.value.details || []).map((detail) => ({
     ...detail,
-    totalPrice:
-      detail.totalPrice ??
-      (detail.price != null && detail.quantity
-        ? Number((Number(detail.price) * Number(detail.quantity)).toFixed(2))
-        : undefined)
+    totalPrice: detail.totalPrice ?? multiplyPrice(detail.quantity, detail.price)
   }))
 )