✨ feat(mes): 添加到货通知单行列表查询接口及相关字段调整

新增获取到货通知单行列表的接口，支持通过通知单编号查询。调整相关数据模型，更新字段名称以提高可读性，并移除冗余字段，优化数据结构。同时，更新前端组件以支持新接口的调用和展示。

BREAKING CHANGE: 修改了到货通知单行的字段名称和接口路径

src/api/mes/wm/arrivalnotice/line/index.ts

@@ -43,5 +43,12 @@ export const WmArrivalNoticeLineApi = {
   // 删除到货通知单行
   deleteArrivalNoticeLine: async (id: number) => {
     return await request.delete({ url: '/mes/wm/arrival-notice-line/delete?id=' + id })
+  },
+
+  // 查询到货通知单行列表（按通知单编号）
+  getArrivalNoticeLineListByNoticeId: async (noticeId: number) => {
+    return await request.get({
+      url: '/mes/wm/arrival-notice-line/list-by-notice-id?noticeId=' + noticeId
+    })
   }
 }

src/api/mes/wm/itemreceipt/index.ts

@@ -57,8 +57,8 @@ export const WmItemReceiptApi = {
   },
 
   // 执行上架
-  shelvingItemReceipt: async (id: number) => {
+  stockItemReceipt: async (id: number) => {
-    return await request.put({ url: '/mes/wm/item-receipt/shelving?id=' + id })
+    return await request.put({ url: '/mes/wm/item-receipt/stock?id=' + id })
   },
 
   // 执行入库

src/api/mes/wm/itemreceipt/line/index.ts

@@ -4,7 +4,7 @@ import request from '@/config/axios'
 export interface WmItemReceiptLineVO {
   id: number
   receiptId: number
-  noticeLineId: number
+  arrivalNoticeLineId: number
   itemId: number
   itemCode: string
   itemName: string

src/views/mes/wm/arrivalnotice/components/WmArrivalNoticeLineSelect.vue

@@ -0,0 +1,99 @@
+<!-- MES 到货通知单行选择器：纯下拉，前端过滤（支持 itemCode、itemName），支持按到货通知单筛选 -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    :filter-method="handleFilter"
+    class="!w-1/1"
+    @change="handleChange"
+  >
+    <el-option v-for="item in filteredList" :key="item.id" :label="`${item.itemCode} - ${item.itemName}`" :value="item.id">
+      <div class="flex items-center gap-8px">
+        <span>{{ item.itemCode }}</span>
+        <span class="text-gray-500">{{ item.itemName }}</span>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { WmArrivalNoticeLineApi, WmArrivalNoticeLineVO } from '@/api/mes/wm/arrivalnotice/line'
+
+defineOptions({ name: 'WmArrivalNoticeLineSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    noticeId?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择到货通知单行'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: WmArrivalNoticeLineVO | undefined]
+}>()
+
+const allList = ref<WmArrivalNoticeLineVO[]>([])
+const filteredList = ref<WmArrivalNoticeLineVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（itemCode + itemName） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.itemCode?.toLowerCase().includes(keyword) ||
+      item.itemName?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = allList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载列表 */
+const loadList = async () => {
+  if (!props.noticeId) {
+    allList.value = []
+    filteredList.value = []
+    return
+  }
+  allList.value = await WmArrivalNoticeLineApi.getArrivalNoticeLineListByNoticeId(props.noticeId)
+  filteredList.value = allList.value
+}
+
+/** 监听 noticeId 变化，重新加载列表 */
+watch(
+  () => props.noticeId,
+  async () => {
+    selectValue.value = undefined
+    await loadList()
+  }
+)
+
+/** 初始化 */
+onMounted(async () => {
+  await loadList()
+})
+</script>

src/views/mes/wm/itemreceipt/ItemReceiptForm.vue

@@ -33,28 +33,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="采购订单编号" prop="purchaseOrderCode">
-            <el-input
-              v-model="formData.purchaseOrderCode"
-              placeholder="请输入采购订单编号"
-              :disabled="isHeaderReadonly"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="供应商" prop="vendorId">
-            <MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="仓库" prop="warehouseId">
-            <WmWarehouseSelect v-model="formData.warehouseId" :disabled="isHeaderReadonly" />
-          </el-form-item>
-        </el-col>
-        <!-- TODO @AI：放到“采购订单号”前面； -->
         <el-col :span="8">
           <el-form-item label="入库日期" prop="receiptDate">
             <el-date-picker
@@ -70,16 +48,23 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <!-- TODO @AI：放到“采购订单号”前面；-->
           <el-form-item label="到货通知单" prop="noticeId">
             <WmArrivalNoticeSelect
               v-model="formData.noticeId"
+              :status="MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT"
               :disabled="isHeaderReadonly"
               @change="handleNoticeChange"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="8">
+          <el-form-item label="供应商" prop="vendorId">
+            <MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
+          </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"
@@ -94,14 +79,17 @@
     <!-- 非新建模式展示行项目信息（入库物料） -->
     <template v-if="formData.id">
       <el-divider content-position="center">物料信息</el-divider>
-      <ItemReceiptLineList :receipt-id="formData.id" :form-type="formType" />
+      <ItemReceiptLineList
+        :receipt-id="formData.id"
+        :notice-id="formData.noticeId"
+        :form-type="formType"
+      />
     </template>
     <template #footer>
       <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
         确 定
       </el-button>
-      <!-- TODO @AI：上架，还是使用 isStock 类似的单词；其它地方都看着一起调整； -->
+      <el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
-      <el-button v-if="isShelving" @click="handleShelving" type="primary" :disabled="formLoading">
         执行上架
       </el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -113,58 +101,56 @@
 import { generateRandomStr } from '@/utils'
 import { WmItemReceiptApi, WmItemReceiptVO } from '@/api/mes/wm/itemreceipt'
 import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
-import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
 import WmArrivalNoticeSelect from '@/views/mes/wm/arrivalnotice/components/WmArrivalNoticeSelect.vue'
 import ItemReceiptLineList from './ItemReceiptLineList.vue'
+import { MesWmArrivalNoticeStatusEnum } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'ItemReceiptForm' })
 
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中
 const formType = ref<string>('create') // 表单的类型：create / update / shelving / detail
 const formData = ref({
   id: undefined as number | undefined,
   code: undefined,
   name: undefined,
-  purchaseOrderCode: undefined,
   vendorId: undefined,
-  warehouseId: undefined,
-  locationId: undefined,
-  areaId: undefined,
   noticeId: undefined,
   iqcId: undefined,
   receiptDate: undefined,
   remark: undefined
 })
 const formRules = reactive({
-  code: [{ required: true, message: '入库单编号不能为空', trigger: 'blur' }]
+  code: [{ required: true, message: '入库单编号不能为空', trigger: 'blur' }],
+  receiptDate: [{ required: true, message: '入库日期不能为空', trigger: 'change' }],
+  vendorId: [{ required: true, message: '供应商不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
 const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
-const isShelving = computed(() => formType.value === 'shelving') // 是否为上架模式
+const isStock = computed(() => formType.value === 'shelving') // 是否为上架模式
 const isHeaderReadonly = computed(() => ['shelving', 'detail'].includes(formType.value)) // 是否只读
-// TODO @AI：dialogTitleMap 的处理，参考 iqc form 的；通过 compute 计算；
+const dialogTitle = computed(() => {
-const dialogTitleMap: Record<string, string> = {
+  const titles = {
-  create: '新增采购入库单',
+    create: '新增采购入库单',
-  update: '编辑采购入库单',
+    update: '编辑采购入库单',
-  shelving: '执行上架',
+    shelving: '执行上架',
-  detail: '采购入库单详情'
+    detail: '采购入库单详情'
-} // 弹窗标题映射
+  }
+  return titles[formType.value] || formType.value
+})
 
 /** 生成入库单编号 */
 const generateCode = () => {
   formData.value.code = 'IR' + generateRandomStr(10)
 }
 
-/** 到货通知单变化时，自动填充供应商和采购订单号 */
+/** 到货通知单变化时，自动填充供应商 */
 const handleNoticeChange = (notice: any) => {
   if (notice) {
     formData.value.vendorId = notice.vendorId
-    formData.value.purchaseOrderCode = notice.purchaseOrderCode
   }
 }
 
@@ -172,7 +158,6 @@ const handleNoticeChange = (notice: any) => {
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   formType.value = type
-  dialogTitle.value = dialogTitleMap[type] || type
   resetForm()
   // 修改/上架/详情时，加载数据
   if (id) {
@@ -196,14 +181,14 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as WmItemReceiptVO
     if (formType.value === 'create') {
-      await WmItemReceiptApi.createItemReceipt(data)
+      const res = await WmItemReceiptApi.createItemReceipt(data)
       message.success('新增成功')
-      // TODO @AI：参考 iqc form 处理下这里；
+      formData.value.id = res
+      formType.value = 'update'
     } else {
       await WmItemReceiptApi.updateItemReceipt(data)
       message.success('修改成功')
     }
-    dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -211,12 +196,12 @@ const submitForm = async () => {
   }
 }
 
-/** 执行上架（shelving 模式） */
+/** 执行上架 */
-const handleShelving = async () => {
+const handleStock = async () => {
   try {
     await message.confirm('确认执行上架？')
     formLoading.value = true
-    await WmItemReceiptApi.shelvingItemReceipt(formData.value.id!)
+    await WmItemReceiptApi.stockItemReceipt(formData.value.id!)
     message.success('上架成功')
     dialogVisible.value = false
     emit('success')
@@ -232,11 +217,7 @@ const resetForm = () => {
     id: undefined,
     code: undefined,
     name: undefined,
-    purchaseOrderCode: undefined,
     vendorId: undefined,
-    warehouseId: undefined,
-    locationId: undefined,
-    areaId: undefined,
     noticeId: undefined,
     iqcId: undefined,
     receiptDate: undefined,

src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue

@@ -1,5 +1,4 @@
 <!-- MES 采购入库单行列表子组件 -->
-<!-- TODO @AI：每一行的摆放，优化下； -->
 <template>
   <div>
     <el-button v-if="isUpdate" type="primary" plain @click="openForm('create')" class="mb-10px">
@@ -33,15 +32,9 @@
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="入库数量" align="center" prop="receivedQuantity" width="100" />
-      <!-- TODO @AI：批次号；batchCode -->
+      <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column
-        label="生产批号"
+        v-if="isUpdate || isStock"
-        align="center"
-        prop="productionBatchNumber"
-        min-width="120"
-      />
-      <el-table-column
-        v-if="isUpdate || isShelving"
         label="操作"
         align="center"
         width="160"
@@ -54,7 +47,7 @@
           <el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
             删除
           </el-button>
-          <el-button v-if="isShelving" link type="success" @click="handleShelving(scope.row.id)">
+          <el-button v-if="isStock" link type="success" @click="handleShelving(scope.row.id)">
             上架
           </el-button>
         </template>
@@ -78,27 +71,26 @@
       v-loading="formLoading"
     >
       <el-row>
-        <el-col :span="12">
+        <el-col :span="8" v-if="hasNoticeId">
-          <!-- TODO @AI：分成两种情况： 1）默认是物料选择；2）如果选择了“到货通知单”，则前面多一个选择“到货通知单”的 line；（然后物料不可选择 disabled 或者 readonly 都行）【这里也在 arrivalnotice 那，封装一个 select 组件，可维护性更好】-->
+          <el-form-item label="到货通知单行" prop="arrivalNoticeLineId">
-          <el-form-item label="物料" prop="itemId">
+            <WmArrivalNoticeLineSelect
-            <!-- TODO @AI：换成物料组件的选择器；已经封装 -->
+              v-model="formData.arrivalNoticeLineId"
-            <el-select
+              :notice-id="props.noticeId"
-              v-model="formData.itemId"
+              @change="handleNoticeLineChange"
-              placeholder="请选择物料"
+            />
-              filterable
-              clearable
-              class="!w-1/1"
-            >
-              <el-option
-                v-for="item in itemList"
-                :key="item.id"
-                :label="`${item.code} - ${item.name}`"
-                :value="item.id"
-              />
-            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
+          <el-form-item label="物料" prop="itemId">
+            <MdItemSelect
+              v-model="formData.itemId"
+              placeholder="请选择物料"
+              class="!w-1/1"
+              :disabled="!!formData.arrivalNoticeLineId"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="入库数量" prop="receivedQuantity">
             <el-input-number
               v-model="formData.receivedQuantity"
@@ -111,21 +103,23 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="生产批号" prop="productionBatchNumber">
             <el-input v-model="formData.productionBatchNumber" placeholder="请输入生产批号" />
           </el-form-item>
-          <!-- TODO @AI：批次号 -->
         </el-col>
-      </el-row>
+        <el-col :span="8">
-      <el-row>
+          <el-form-item label="批次编码" prop="batchCode">
+            <el-input v-model="formData.batchCode" placeholder="请输入批次编码" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="生产日期" prop="productionDate">
             <el-date-picker
               v-model="formData.productionDate"
               type="date"
               value-format="x"
-              placeholder="请选择"
+              placeholder="请选择生产日期"
               class="!w-1/1"
             />
           </el-form-item>
@@ -136,7 +130,7 @@
               v-model="formData.expireDate"
               type="date"
               value-format="x"
-              placeholder="请选择"
+              placeholder="请选择有效期"
               class="!w-1/1"
             />
           </el-form-item>
@@ -166,7 +160,8 @@
 
 <script setup lang="ts">
 import { WmItemReceiptLineApi, WmItemReceiptLineVO } from '@/api/mes/wm/itemreceipt/line'
-import { MdItemApi } from '@/api/mes/md/item'
+import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import WmArrivalNoticeLineSelect from '@/views/mes/wm/arrivalnotice/components/WmArrivalNoticeLineSelect.vue'
 import ItemReceiptDetailList from './ItemReceiptDetailList.vue'
 import ItemReceiptDetailForm from './ItemReceiptDetailForm.vue'
 
@@ -174,6 +169,7 @@ defineOptions({ name: 'ItemReceiptLineList' })
 
 const props = defineProps<{
   receiptId: number
+  noticeId?: number
   formType: string
 }>()
 
@@ -181,7 +177,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
-const isShelving = computed(() => props.formType === 'shelving') // 是否为上架模式
+const isStock = computed(() => props.formType === 'shelving') // 是否为上架模式
 
 // ==================== 列表 ====================
 const loading = ref(false) // 列表的加载中
@@ -221,35 +217,41 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中
 const lineFormType = ref('') // 行表单的类型
-const itemList = ref<any[]>([]) // 物料列表
+const hasNoticeId = computed(() => !!props.noticeId) // 是否有到货通知单
 const formData = ref({
   id: undefined,
   receiptId: undefined as number | undefined,
+  arrivalNoticeLineId: undefined,
   itemId: undefined,
   receivedQuantity: undefined,
-  locationId: undefined,
-  areaId: undefined,
   batchId: undefined,
+  batchCode: undefined,
   productionDate: undefined,
   expireDate: undefined,
   productionBatchNumber: undefined,
   remark: undefined
 })
 const formRules = reactive({
-  // TODO @AI：如果选择了“到货通知单”，则前面多一个选择“到货通知单”的 line；必填；
+  arrivalNoticeLineId: [{ required: true, message: '到货通知单行不能为空', trigger: 'change' }],
   itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
   receivedQuantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
+/** 到货通知单行变化时，自动填充物料信息 */
+const handleNoticeLineChange = (line: any) => {
+  if (line) {
+    formData.value.itemId = line.itemId
+    formData.value.receivedQuantity = line.arrivalQuantity
+  }
+}
+
 /** 打开表单弹窗 */
 const openForm = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   lineFormType.value = type
   resetForm()
-  // 加载物料列表
-  itemList.value = await MdItemApi.getItemSimpleList()
   if (id) {
     formLoading.value = true
     try {
@@ -285,11 +287,11 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     receiptId: undefined,
+    arrivalNoticeLineId: undefined,
     itemId: undefined,
     receivedQuantity: undefined,
-    locationId: undefined,
-    areaId: undefined,
     batchId: undefined,
+    batchCode: undefined,
     productionDate: undefined,
     expireDate: undefined,
     productionBatchNumber: undefined,

src/views/mes/wm/itemreceipt/index.vue

@@ -25,15 +25,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="采购订单编号" prop="purchaseOrderCode">
-        <el-input
-          v-model="queryParams.purchaseOrderCode"
-          placeholder="请输入采购订单编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="供应商" prop="vendorId">
         <el-select
           v-model="queryParams.vendorId"
@@ -60,21 +51,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="单据状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择单据状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -103,12 +79,6 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="入库单编号" align="center" prop="code" min-width="160" />
       <el-table-column label="入库单名称" align="center" prop="name" min-width="150" />
-      <el-table-column
-        label="采购订单编号"
-        align="center"
-        prop="purchaseOrderCode"
-        min-width="140"
-      />
       <el-table-column label="供应商名称" align="center" prop="vendorName" min-width="120" />
       <el-table-column
         label="入库日期"
@@ -122,13 +92,6 @@
           <dict-tag :type="DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column label="操作" align="center" width="240" fixed="right">
         <template #default="scope">
           <!-- 草稿：编辑、提交、删除 -->
@@ -179,23 +142,20 @@
           >
             执行入库
           </el-button>
-          <!-- TODO DONE @AI：确认只有待上架和待入库状态可以取消 -->
           <el-button
             link
             type="danger"
             @click="handleCancel(scope.row.id)"
             v-hasPermi="['mes:wm-item-receipt:update']"
-            v-if="[MesWmItemReceiptStatusEnum.APPROVING, MesWmItemReceiptStatusEnum.APPROVED].includes(scope.row.status)"
+            v-if="
+              [MesWmItemReceiptStatusEnum.APPROVING, MesWmItemReceiptStatusEnum.APPROVED].includes(
+                scope.row.status
+              )
+            "
           >
             取消
           </el-button>
-          <el-button
+          <el-button link type="info" @click="openForm('detail', scope.row.id)"> 详情 </el-button>
-            link
-            type="info"
-            @click="openForm('detail', scope.row.id)"
-          >
-            详情
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -234,10 +194,8 @@ const queryParams = reactive({
   pageSize: 10,
   code: undefined,
   name: undefined,
-  purchaseOrderCode: undefined,
   vendorId: undefined,
-  receiptDate: undefined,
+  receiptDate: undefined
-  status: undefined
 })
 const queryFormRef = ref() // 搜索的表单