From 0fb0150579ead6c6159d42de0d5be44334a699f3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 10 Mar 2026 23:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E8=A1=8C=E7=9A=84=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=92=8C=E5=93=8D=E5=BA=94=20VO=20=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 MesWmStockTakingTaskLinePageReqVO 和 MesWmStockTakingTaskLineSaveReqVO 类，支持盘点任务行的分页请求和新增/修改请求。同时，创建 MesWmStockTakingTaskLineController 控制器，提供相应的 API 接口，增强系统的功能性和可维护性。
---
 src/api/mes/wm/stocktaking/task/line/index.ts |  26 +-
 .../wm/stocktaking/task/StockTakingForm.vue   |  21 +-
 .../task/StockTakingTaskLineList.vue          | 260 ++++++++++++++++++
 .../task/StockTakingTaskResultList.vue        |  61 ++++
 4 files changed, 352 insertions(+), 16 deletions(-)
 create mode 100644 src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
 create mode 100644 src/views/mes/wm/stocktaking/task/StockTakingTaskResultList.vue

diff --git a/src/api/mes/wm/stocktaking/task/line/index.ts b/src/api/mes/wm/stocktaking/task/line/index.ts
index d5b569e15..e6b4eb4bc 100644
--- a/src/api/mes/wm/stocktaking/task/line/index.ts
+++ b/src/api/mes/wm/stocktaking/task/line/index.ts
@@ -24,22 +24,20 @@ export interface StockTakingTaskLineVO {
   remark?: string
 }
 
-// TODO @AI：可能不需要这个；
-export interface StockTakingTaskLineBatchUpdateReqVO {
-  taskId: number
-  items: Array<{
-    id: number
-    takingQuantity: number
-    remark?: string
-  }>
-}
-
 export const StockTakingTaskLineApi = {
-  getStockTakingTaskLineList: async (taskId: number) => {
-    return await request.get({ url: '/mes/wm/stocktaking-task/line-list?taskId=' + taskId })
+  getStockTakingTaskLinePage: async (params: any) => {
+    return await request.get({ url: '/mes/wm/stocktaking-task-line/page', params })
   },
 
-  batchUpdateStockTakingTaskLines: async (data: StockTakingTaskLineBatchUpdateReqVO) => {
-    return await request.put({ url: '/mes/wm/stocktaking-task/line-batch-update', data })
+  createStockTakingTaskLine: async (data: StockTakingTaskLineVO) => {
+    return await request.post({ url: '/mes/wm/stocktaking-task-line/create', data })
+  },
+
+  updateStockTakingTaskLine: async (data: StockTakingTaskLineVO) => {
+    return await request.put({ url: '/mes/wm/stocktaking-task-line/update', data })
+  },
+
+  deleteStockTakingTaskLine: async (id: number) => {
+    return await request.delete({ url: '/mes/wm/stocktaking-task-line/delete?id=' + id })
   }
 }
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index fc92c88fd..22ab162a9 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -112,6 +112,15 @@
       </el-row>
     </el-form>
 
+    <el-tabs v-if="formData.id" type="border-card" class="mt-16px">
+      <el-tab-pane v-if="!formData.blindFlag" label="盘点清单">
+        <StockTakingTaskLineList :task-id="formData.id" :form-type="formType" />
+      </el-tab-pane>
+      <el-tab-pane v-if="resultVisible" label="盘点结果">
+        <StockTakingTaskResultList :task-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+
     <template #footer>
       <el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">
         确 定
@@ -128,7 +137,12 @@ import { StockTakingApi, type StockTakingTaskVO } from '@/api/mes/wm/stocktaking
 import { type StockTakingPlanVO } from '@/api/mes/wm/stocktaking/plan/index'
 import StockTakingPlanSelect from '@/views/mes/wm/stocktaking/plan/components/StockTakingPlanSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
-import { MesWmStockTakingTypeEnum } from '@/views/mes/utils/constants'
+import StockTakingTaskLineList from './StockTakingTaskLineList.vue'
+import StockTakingTaskResultList from './StockTakingTaskResultList.vue'
+import {
+  MesWmStockTakingTypeEnum,
+  MesWmStockTakingTaskStatusEnum
+} from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'StockTakingForm' })
 
@@ -148,7 +162,9 @@ const dialogTitle = computed(() => {
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('create') // 表单的类型：create - 新增；update - 修改；detail - 详情
 const isDetail = computed(() => formType.value === 'detail') // 是否只读
-const formRef = ref() // 表单 Ref
+const resultVisible = computed(
+  () => formData.value.status && formData.value.status !== MesWmStockTakingTaskStatusEnum.PREPARE
+)
 const formData = ref<StockTakingTaskVO>({
   id: undefined,
   code: undefined,
@@ -174,6 +190,7 @@ const formRules = reactive({
   frozenFlag: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
   userId: [{ required: true, message: '盘点人不能为空', trigger: 'change' }]
 })
+const formRef = ref() // 表单 Ref
 
 /** 生成任务编码 */
 const generateCode = () => {
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
new file mode 100644
index 000000000..6bb0cf687
--- /dev/null
+++ b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
@@ -0,0 +1,260 @@
+<!-- MES 盘点任务行列表子组件 -->
+<template>
+  <div>
+    <el-button
+      v-if="!isReadOnly"
+      v-hasPermi="['mes:wm-stock-taking-task:update']"
+      type="primary"
+      plain
+      @click="handleAdd"
+      class="mb-10px"
+    >
+      <Icon icon="ep:plus" class="mr-5px" /> 添加物料
+    </el-button>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      border
+    >
+      <el-table-column label="物料编码" prop="itemCode" min-width="140" />
+      <el-table-column label="物料名称" prop="itemName" min-width="160" />
+      <el-table-column label="规格型号" prop="specification" min-width="120" />
+      <el-table-column label="单位" prop="unitMeasureName" width="90" />
+      <el-table-column label="在库数量" prop="quantity" width="120" />
+      <el-table-column label="仓库" prop="warehouseName" min-width="120" />
+      <el-table-column label="库区" prop="locationName" min-width="120" />
+      <el-table-column label="库位" prop="areaName" min-width="120" />
+      <el-table-column label="状态" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!isReadOnly" label="操作" width="160" fixed="right">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleEdit(scope.row)"
+            v-hasPermi="['mes:wm-stock-taking-task:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['mes:wm-stock-taking-task:update']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
+      >
+        <el-form-item label="物料" prop="itemId">
+          <MdItemSelect v-model="formData.itemId" placeholder="请选择物料" class="!w-full" />
+        </el-form-item>
+        <el-form-item label="仓库" prop="warehouseId">
+          <WmWarehouseSelect v-model="formData.warehouseId" placeholder="请选择仓库" class="!w-full" />
+        </el-form-item>
+        <el-form-item label="库区" prop="locationId">
+          <WmWarehouseLocationSelect
+            v-model="formData.locationId"
+            :warehouse-id="formData.warehouseId"
+            placeholder="请选择库区"
+            class="!w-full"
+          />
+        </el-form-item>
+        <el-form-item label="库位" prop="areaId">
+          <WmWarehouseAreaSelect
+            v-model="formData.areaId"
+            :location-id="formData.locationId"
+            placeholder="请选择库位"
+            class="!w-full"
+          />
+        </el-form-item>
+        <el-form-item label="在库数量" prop="quantity">
+          <el-input-number
+            v-model="formData.quantity"
+            :precision="2"
+            :min="0"
+            controls-position="right"
+            class="!w-full"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="formData.status" placeholder="请选择状态" class="!w-full">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </template>
+    </Dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {
+  StockTakingTaskLineApi,
+  type StockTakingTaskLineVO
+} from '@/api/mes/wm/stocktaking/task/line/index'
+import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
+import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
+import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
+
+defineOptions({ name: 'StockTakingTaskLineList' })
+
+const props = defineProps<{
+  taskId: number
+  formType?: string
+}>()
+
+const message = useMessage()
+const { t } = useI18n()
+
+const isReadOnly = computed(() => props.formType === 'detail')
+const loading = ref(false)
+const list = ref<StockTakingTaskLineVO[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  taskId: undefined as number | undefined
+})
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const dialogFormType = ref('')
+const formRef = ref()
+
+const formData = ref({
+  id: undefined,
+  taskId: undefined,
+  itemId: undefined,
+  warehouseId: undefined,
+  locationId: undefined,
+  areaId: undefined,
+  quantity: undefined,
+  status: undefined,
+  remark: undefined
+})
+
+const formRules = reactive({
+  itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
+  quantity: [{ required: true, message: '在库数量不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+
+const getList = async () => {
+  if (!props.taskId) return
+  loading.value = true
+  try {
+    queryParams.taskId = props.taskId
+    const data = await StockTakingTaskLineApi.getStockTakingTaskLinePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleAdd = () => {
+  dialogVisible.value = true
+  dialogTitle.value = '添加盘点任务行'
+  dialogFormType.value = 'create'
+  resetForm()
+}
+
+const handleEdit = async (row: StockTakingTaskLineVO) => {
+  dialogVisible.value = true
+  dialogTitle.value = '编辑盘点任务行'
+  dialogFormType.value = 'update'
+  formData.value = { ...row }
+}
+
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = { ...formData.value, taskId: props.taskId }
+    if (dialogFormType.value === 'create') {
+      await StockTakingTaskLineApi.createStockTakingTaskLine(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StockTakingTaskLineApi.updateStockTakingTaskLine(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    await getList()
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    taskId: undefined,
+    itemId: undefined,
+    warehouseId: undefined,
+    locationId: undefined,
+    areaId: undefined,
+    quantity: undefined,
+    status: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await StockTakingTaskLineApi.deleteStockTakingTaskLine(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+watch(
+  () => props.taskId,
+  () => {
+    queryParams.pageNo = 1
+    getList()
+  },
+  { immediate: true }
+)
+
+defineExpose({ getList })
+</script>
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingTaskResultList.vue b/src/views/mes/wm/stocktaking/task/StockTakingTaskResultList.vue
new file mode 100644
index 000000000..0d8c33790
--- /dev/null
+++ b/src/views/mes/wm/stocktaking/task/StockTakingTaskResultList.vue
@@ -0,0 +1,61 @@
+<!-- MES 盘点任务结果列表子组件 -->
+<template>
+  <div>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      border
+    >
+      <el-table-column type="index" label="#" width="60" />
+      <el-table-column label="物料编码" prop="itemCode" min-width="140" />
+      <el-table-column label="物料名称" prop="itemName" min-width="160" />
+      <el-table-column label="规格" prop="specification" min-width="120" />
+      <el-table-column label="单位" prop="unitMeasureName" width="90" />
+      <el-table-column label="批次" prop="batchCode" min-width="120" />
+      <el-table-column label="仓库" prop="warehouseName" min-width="120" />
+      <el-table-column label="库区" prop="locationName" min-width="120" />
+      <el-table-column label="库位" prop="areaName" min-width="120" />
+      <el-table-column label="差异数量" prop="quantity" min-width="120" />
+      <el-table-column label="备注" prop="remark" min-width="180" />
+      <el-table-column label="生成时间" prop="createTime" min-width="180" />
+    </el-table>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  StockTakingResultApi,
+  type StockTakingResultVO
+} from '@/api/mes/wm/stocktaking/task/result/index'
+
+defineOptions({ name: 'StockTakingTaskResultList' })
+
+const props = defineProps<{
+  taskId: number
+}>()
+
+const loading = ref(false)
+const list = ref<StockTakingResultVO[]>([])
+
+const getList = async () => {
+  if (!props.taskId) return
+  loading.value = true
+  try {
+    list.value = await StockTakingResultApi.getStockTakingResultList(props.taskId)
+  } finally {
+    loading.value = false
+  }
+}
+
+watch(
+  () => props.taskId,
+  () => {
+    getList()
+  },
+  { immediate: true }
+)
+
+defineExpose({ getList })
+</script>