From b3d587b1c2c23d83776588a90aaed45d811686c7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 6 Apr 2026 12:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=E7=BC=96=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=98=E7=82=B9=E8=A1=8C?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/stocktaking/task/line/index.ts |   2 +-
 src/views/mes/wm/packages/PackageLineList.vue |   2 +-
 .../task/StockTakingTaskLineList.vue          | 213 ++++--------------
 3 files changed, 41 insertions(+), 176 deletions(-)

diff --git a/src/api/mes/wm/stocktaking/task/line/index.ts b/src/api/mes/wm/stocktaking/task/line/index.ts
index 8c2b1b8d8..a4e225f02 100644
--- a/src/api/mes/wm/stocktaking/task/line/index.ts
+++ b/src/api/mes/wm/stocktaking/task/line/index.ts
@@ -1,7 +1,7 @@
 import request from '@/config/axios'
 
 export interface StockTakingTaskLineVO {
-  id: number
+  id?: number
   taskId: number
   materialStockId?: number
   itemId?: number
diff --git a/src/views/mes/wm/packages/PackageLineList.vue b/src/views/mes/wm/packages/PackageLineList.vue
index fde6ebeb6..e8bf15385 100644
--- a/src/views/mes/wm/packages/PackageLineList.vue
+++ b/src/views/mes/wm/packages/PackageLineList.vue
@@ -128,7 +128,7 @@ const queryParams = reactive({
 const getList = async () => {
   loading.value = true
   try {
-    // TODO @芋艿：需确认“父箱详情 -> 装箱清单”是否要和 ktg-mes 一样，自动汇总当前箱及其子孙箱明细；
+    // TODO @芋艿：需确认“父箱详情 -> 装箱清单”是否要和【对齐】一样，自动汇总当前箱及其子孙箱明细；
     // 目前前端仅传当前 packageId，最终查询范围取决于后端 package-line/page 的实现。
     queryParams.packageId = props.packageId
     const data = await WmPackageLineApi.getPackageLinePage(queryParams)
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
index cbd3b0a0d..82abc1193 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
@@ -7,7 +7,7 @@
       v-hasPermi="['mes:wm-stock-taking-task:update']"
       type="primary"
       plain
-      @click="openForm('create')"
+      @click="handleAdd"
       class="mb-10px"
     >
       <Icon icon="ep:plus" class="mr-5px" /> 添加物料
@@ -17,6 +17,7 @@
       <el-table-column label="物料名称" align="center" prop="itemName" min-width="160" />
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="90" />
+      <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column label="在库数量" align="center" prop="quantity" width="120" />
       <el-table-column label="仓库" align="center" prop="warehouseName" min-width="120" />
       <el-table-column label="库区" align="center" prop="locationName" min-width="120" />
@@ -26,9 +27,8 @@
           <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="操作" align="center" width="160" fixed="right">
+      <el-table-column v-if="!isReadOnly" label="操作" align="center" width="80" fixed="right">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
           <el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
@@ -41,101 +41,22 @@
     />
   </div>
 
-  <!-- 添加/编辑行弹窗 -->
-  <!-- TODO @芋艿：后续要改成 stockSelect 批量选择后，进行处理； -->
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-    >
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料" prop="itemId">
-            <MdItemSelect v-model="formData.itemId" placeholder="请选择物料" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="在库数量" prop="quantity">
-            <el-input-number
-              v-model="formData.quantity"
-              :precision="2"
-              :min="0"
-              controls-position="right"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="状态" prop="status">
-            <el-select v-model="formData.status" placeholder="请选择状态">
-              <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-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="仓库" prop="warehouseId">
-            <WmWarehouseSelect
-              v-model="formData.warehouseId"
-              placeholder="请选择仓库"
-              @change="handleWarehouseChange"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="formData.warehouseId">
-          <el-form-item label="库区" prop="locationId">
-            <WmWarehouseLocationSelect
-              v-model="formData.locationId"
-              :warehouse-id="formData.warehouseId"
-              placeholder="请选择库区"
-              @change="handleLocationChange"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="formData.locationId">
-          <el-form-item label="库位" prop="areaId">
-            <WmWarehouseAreaSelect
-              v-model="formData.areaId"
-              :location-id="formData.locationId"
-              placeholder="请选择库位"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+  <!-- 库存选择弹窗（多选模式） -->
+  <WmMaterialStockSelectDialog
+    ref="stockSelectDialogRef"
+    :multiple="true"
+    @selected="onStockSelected"
+  />
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE } 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'
+} from '@/api/mes/wm/stocktaking/task/line'
+import { type WmMaterialStockVO } from '@/api/mes/wm/materialstock'
+import WmMaterialStockSelectDialog from '@/views/mes/wm/materialstock/components/WmMaterialStockSelectDialog.vue'
 
 defineOptions({ name: 'StockTakingTaskLineList' })
 
@@ -183,98 +104,42 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-// ==================== 添加/编辑表单 ====================
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const dialogFormType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  taskId: undefined as number | 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' }],
-  locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }],
-  areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }],
-  quantity: [{ required: true, message: '在库数量不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
-}) // 表单校验规则
-const formRef = ref() // 表单 Ref
+// ==================== 库存批量选择 ====================
+const stockSelectDialogRef = ref() // 库存选择弹窗 Ref
 
-/** 打开表单弹窗 */
-const openForm = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  dialogFormType.value = type
-  resetForm()
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await StockTakingTaskLineApi.getStockTakingTaskLine(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
+/** 点击"添加物料"按钮，打开库存选择弹窗 */
+const handleAdd = () => {
+  stockSelectDialogRef.value.open()
 }
 
-/** 提交表单 */
-const submitForm = async () => {
-  await formRef.value.validate()
-  formLoading.value = true
+/** 库存选择确认回调：将选中的库存记录批量创建为盘点行 */
+const onStockSelected = async (rows: WmMaterialStockVO[]) => {
+  if (!rows || rows.length === 0) {
+    return
+  }
+  loading.value = true
   try {
-    const data = {
-      ...formData.value,
-      taskId: props.taskId
-    } as unknown as StockTakingTaskLineVO
-    if (dialogFormType.value === 'create') {
-      await StockTakingTaskLineApi.createStockTakingTaskLine(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await StockTakingTaskLineApi.updateStockTakingTaskLine(data)
-      message.success(t('common.updateSuccess'))
+    // 逐条创建盘点行（映射库存记录 → 盘点行）
+    for (const stock of rows) {
+      const lineData = {
+        taskId: props.taskId,
+        materialStockId: stock.id,
+        itemId: stock.itemId,
+        batchId: stock.batchId,
+        quantity: stock.quantity,
+        warehouseId: stock.warehouseId,
+        locationId: stock.locationId,
+        areaId: stock.areaId
+      }
+      await StockTakingTaskLineApi.createStockTakingTaskLine(lineData)
     }
-    dialogVisible.value = false
+    message.success(`成功添加 ${rows.length} 条盘点行`)
     await getList()
   } finally {
-    formLoading.value = false
+    loading.value = false
   }
 }
 
-/** 仓库变化时清空库区和库位 */
-const handleWarehouseChange = () => {
-  formData.value.locationId = undefined
-  formData.value.areaId = undefined
-}
-
-/** 库区变化时清空库位 */
-const handleLocationChange = () => {
-  formData.value.areaId = undefined
-}
-
-/** 重置表单 */
-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()
-}
-
 /** 监听 taskId 变化 */
 watch(
   () => props.taskId,