✨ feat(mes): 添加产品收货单明细数量校验功能

新增校验产品收货单明细数量的接口，确保每行明细数量之和与行收货数量一致。此功能提升了数据的准确性和完整性，避免了潜在的入库错误。

- 添加 checkProductRecptQuantity 方法
- 更新相关接口以支持数量校验

src/api/mes/wm/productrecpt/detail/index.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+// MES 产品入库单明细 VO
+export interface WmProductRecptDetailVO {
+  id: number
+  lineId: number
+  recptId: number
+  itemId: number
+  itemCode: string
+  quantity: number
+  batchId: number
+  warehouseId: number
+  warehouseName: string
+  locationId: number
+  locationName: string
+  areaId: number
+  areaName: string
+  remark: string
+  createTime: string
+}
+
+// MES 产品入库单明细 API
+export const WmProductRecptDetailApi = {
+  // 查询产品入库单明细列表
+  getProductRecptDetailList: async (params: any) => {
+    return await request.get({ url: '/mes/wm/product-recpt-detail/list', params })
+  },
+
+  // 根据行项目ID查询产品入库单明细列表
+  getProductRecptDetailListByLineId: async (lineId: number) => {
+    return await request.get({ url: '/mes/wm/product-recpt-detail/list-by-line', params: { lineId } })
+  },
+
+  // 查询产品入库单明细详情
+  getProductRecptDetail: async (id: number) => {
+    return await request.get({ url: '/mes/wm/product-recpt-detail/get?id=' + id })
+  },
+
+  // 新增产品入库单明细
+  createProductRecptDetail: async (data: WmProductRecptDetailVO) => {
+    return await request.post({ url: '/mes/wm/product-recpt-detail/create', data })
+  },
+
+  // 修改产品入库单明细
+  updateProductRecptDetail: async (data: WmProductRecptDetailVO) => {
+    return await request.put({ url: '/mes/wm/product-recpt-detail/update', data })
+  },
+
+  // 删除产品入库单明细
+  deleteProductRecptDetail: async (id: number) => {
+    return await request.delete({ url: '/mes/wm/product-recpt-detail/delete?id=' + id })
+  }
+}

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

@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+// MES 产品入库单 VO
+export interface WmProductRecptVO {
+  id: number
+  code: string
+  name: string
+  workOrderId: number
+  workOrderCode: string
+  itemId: number
+  itemCode: string
+  itemName: string
+  specification: string
+  unitMeasureName: string
+  receiptDate: string
+  status: number
+  remark: string
+  createTime: string
+}
+
+// MES 产品入库单 API
+export const WmProductRecptApi = {
+  // 查询产品入库单分页
+  getProductRecptPage: async (params: any) => {
+    return await request.get({ url: '/mes/wm/product-recpt/page', params })
+  },
+
+  // 查询产品入库单详情
+  getProductRecpt: async (id: number) => {
+    return await request.get({ url: '/mes/wm/product-recpt/get?id=' + id })
+  },
+
+  // 新增产品入库单
+  createProductRecpt: async (data: WmProductRecptVO) => {
+    return await request.post({ url: '/mes/wm/product-recpt/create', data })
+  },
+
+  // 修改产品入库单
+  updateProductRecpt: async (data: WmProductRecptVO) => {
+    return await request.put({ url: '/mes/wm/product-recpt/update', data })
+  },
+
+  // 删除产品入库单
+  deleteProductRecpt: async (id: number) => {
+    return await request.delete({ url: '/mes/wm/product-recpt/delete?id=' + id })
+  },
+
+  // 提交产品入库单
+  submitProductRecpt: async (id: number) => {
+    return await request.put({ url: '/mes/wm/product-recpt/submit?id=' + id })
+  },
+
+  // 执行上架
+  stockProductRecpt: async (id: number) => {
+    return await request.put({ url: '/mes/wm/product-recpt/stock?id=' + id })
+  },
+
+  // 执行入库
+  executeProductRecpt: async (id: number) => {
+    return await request.put({ url: '/mes/wm/product-recpt/execute?id=' + id })
+  },
+
+  // 取消产品入库单
+  cancelProductRecpt: async (id: number) => {
+    return await request.put({ url: '/mes/wm/product-recpt/cancel?id=' + id })
+  },
+
+  // 校验产品入库单明细数量
+  checkProductRecptQuantity: async (id: number) => {
+    return await request.get({ url: '/mes/wm/product-recpt/check-quantity?id=' + id })
+  },
+
+  // 导出产品入库单 Excel
+  exportProductRecpt: async (params: any) => {
+    return await request.download({ url: '/mes/wm/product-recpt/export-excel', params })
+  }
+}

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

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// MES 产品入库单行 VO
+export interface WmProductRecptLineVO {
+  id: number
+  recptId: number
+  itemId: number
+  itemCode: string
+  itemName: string
+  specification: string
+  unitMeasureName: string
+  quantity: number
+  batchId: number
+  batchCode: string
+  remark: string
+  createTime: string
+}
+
+// MES 产品入库单行 API
+export const WmProductRecptLineApi = {
+  // 查询产品入库单行分页
+  getProductRecptLinePage: async (params: any) => {
+    return await request.get({ url: '/mes/wm/product-recpt-line/page', params })
+  },
+
+  // 查询产品入库单行详情
+  getProductRecptLine: async (id: number) => {
+    return await request.get({ url: '/mes/wm/product-recpt-line/get?id=' + id })
+  },
+
+  // 新增产品入库单行
+  createProductRecptLine: async (data: WmProductRecptLineVO) => {
+    return await request.post({ url: '/mes/wm/product-recpt-line/create', data })
+  },
+
+  // 修改产品入库单行
+  updateProductRecptLine: async (data: WmProductRecptLineVO) => {
+    return await request.put({ url: '/mes/wm/product-recpt-line/update', data })
+  },
+
+  // 删除产品入库单行
+  deleteProductRecptLine: async (id: number) => {
+    return await request.delete({ url: '/mes/wm/product-recpt-line/delete?id=' + id })
+  }
+}

src/views/mes/utils/constants.ts

@@ -244,6 +244,15 @@ export const MesWmProductProduceStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED
 }
 
+/** MES 产品入库单状态枚举 */
+export const MesWmProductRecptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED
+}
+
 /** 获取物料/产品标识的标签 */
 export const getItemOrProductLabel = (value: string): string => {
   for (const item of Object.values(MesItemOrProductEnum)) {

src/views/mes/wm/productrecpt/ProductRecptForm.vue

@@ -48,13 +48,10 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="生产工单" prop="workOrderId">
-            <ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
+            <ProWorkOrderSelect
-          </el-form-item>
+              v-model="formData.workOrderId"
-        </el-col>
+              :disabled="isHeaderReadonly"
-        <!-- TODO @AI：MdItemSelect 都是 readonly，通过 ProWorkOrderSelect 选择后，设置下； -->
+            />
-        <el-col :span="8">
-          <el-form-item label="产品物料" prop="itemId">
-            <MdItemSelect v-model="formData.itemId" :disabled="isHeaderReadonly" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -91,7 +88,6 @@
 <script setup lang="ts">
 import { generateRandomStr } from '@/utils'
 import { WmProductRecptApi, WmProductRecptVO } from '@/api/mes/wm/productrecpt'
-import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
 import ProductRecptLineList from './ProductRecptLineList.vue'
 
@@ -107,18 +103,13 @@ const formData = ref({
   code: undefined,
   name: undefined,
   workOrderId: undefined,
-  itemId: undefined,
   receiptDate: undefined,
   remark: undefined
 })
 const formRules = reactive({
-  // TODO @AI：name；必填
   code: [{ required: true, message: '入库单编号不能为空', trigger: 'blur' }],
-  receiptDate: [{ required: true, message: '入库日期不能为空', trigger: 'change' }],
+  name: [{ required: true, message: '入库单名称不能为空', trigger: 'blur' }],
-  // TODO @AI：workOrderId 可选；
+  receiptDate: [{ required: true, message: '入库日期不能为空', trigger: 'change' }]
-  workOrderId: [{ required: true, message: '生产工单不能为空', trigger: 'change' }],
-  // TODO @AI：去掉 itemId 必填；
-  itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }]
 })
 const formRef = ref()
 
@@ -183,6 +174,12 @@ const handleStock = async () => {
   try {
     await message.confirm('确认执行上架？')
     formLoading.value = true
+    // 校验明细数量与行收货数量是否一致
+    const quantityMatch = await WmProductRecptApi.checkProductRecptQuantity(formData.value.id!)
+    if (!quantityMatch) {
+      await message.confirm('明细数量与行收货数量不一致，确认执行上架？')
+    }
+    // 执行上架
     await WmProductRecptApi.stockProductRecpt(formData.value.id!)
     message.success('上架成功')
     dialogVisible.value = false
@@ -200,7 +197,6 @@ const resetForm = () => {
     code: undefined,
     name: undefined,
     workOrderId: undefined,
-    itemId: undefined,
     receiptDate: undefined,
     remark: undefined
   }

src/views/mes/wm/productrecpt/ProductRecptLineList.vue

@@ -27,8 +27,8 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
+      <el-table-column label="产品物料编码" align="center" prop="itemCode" min-width="120" />
-      <el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
+      <el-table-column label="产品物料名称" align="center" prop="itemName" min-width="140" />
       <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="quantity" width="100" />
@@ -50,6 +50,7 @@
           <el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
             上架
           </el-button>
+          <!-- TODO @芋艿：【暂不处理】标签打印 -->
         </template>
       </el-table-column>
     </el-table>
@@ -71,13 +72,10 @@
       v-loading="formLoading"
     >
       <el-row>
+        <!-- TODO @芋艿：【后面处理】库存物资选择 -->
         <el-col :span="8">
-          <el-form-item label="物料" prop="itemId">
+          <el-form-item label="物料物料" prop="itemId">
-            <MdItemSelect
+            <MdItemSelect v-model="formData.itemId" placeholder="请选择物料物料" class="!w-1/1" />
-              v-model="formData.itemId"
-              placeholder="请选择物料"
-              class="!w-1/1"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -92,8 +90,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="批次编码" prop="batchCode">
+          <el-form-item label="批次号" prop="batchCode">
-            <el-input v-model="formData.batchCode" placeholder="请输入批次编码" />
+            <el-input v-model="formData.batchCode" placeholder="请输入批次号" />
           </el-form-item>
         </el-col>
       </el-row>

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

@@ -31,27 +31,6 @@
       <el-form-item label="产品物料" prop="itemId">
         <MdItemSelect v-model="queryParams.itemId" 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_PRODUCT_RECPT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入库日期" prop="receiptDate">
-        <el-date-picker
-          v-model="queryParams.receiptDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </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>
@@ -80,9 +59,11 @@
     <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="workOrderCode" min-width="120" />
+      <el-table-column label="生产工单" align="center" prop="workOrderCode" min-width="140" />
-      <!-- TODO @AI：itemName -> itemCode -->
+      <el-table-column label="产品物料编码" align="center" prop="itemCode" min-width="120" />
-      <el-table-column label="产品物料" align="center" prop="itemName" min-width="120" />
+      <el-table-column label="产品物料名称" align="center" prop="itemName" min-width="150" />
+      <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
+      <el-table-column label="计量单位" align="center" prop="unitMeasureName" min-width="100" />
       <el-table-column
         label="入库日期"
         align="center"
@@ -90,7 +71,7 @@
         :formatter="dateFormatter2"
         width="180px"
       />
-      <el-table-column label="单据状态" align="center" prop="status" min-width="100">
+      <el-table-column label="单据状态" align="center" prop="status" min-width="110">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WM_PRODUCT_RECPT_STATUS" :value="scope.row.status" />
         </template>
@@ -125,7 +106,7 @@
           >
             删除
           </el-button>
-          <!-- 待上架：执行上架、取消 -->
+          <!-- 待拣货：执行上架 -->
           <el-button
             link
             type="success"
@@ -135,7 +116,7 @@
           >
             执行上架
           </el-button>
-          <!-- 待入库：执行入库、取消 -->
+          <!-- 待执行入库：执行入库 -->
           <el-button
             link
             type="primary"
@@ -145,15 +126,17 @@
           >
             执行入库
           </el-button>
+          <!-- 待拣货、待执行入库：取消 -->
           <el-button
             link
             type="danger"
             @click="handleCancel(scope.row.id)"
             v-hasPermi="['mes:wm-product-recpt:update']"
             v-if="
-              [MesWmProductRecptStatusEnum.APPROVING, MesWmProductRecptStatusEnum.APPROVED].includes(
+              [
-                scope.row.status
+                MesWmProductRecptStatusEnum.APPROVING,
-              )
+                MesWmProductRecptStatusEnum.APPROVED
+              ].includes(scope.row.status)
             "
           >
             取消
@@ -174,7 +157,7 @@
 
 <script setup lang="ts">
 import { dateFormatter2 } from '@/utils/formatTime'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 import download from '@/utils/download'
 import { WmProductRecptApi, WmProductRecptVO } from '@/api/mes/wm/productrecpt'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
@@ -197,9 +180,7 @@ const queryParams = reactive({
   code: undefined,
   name: undefined,
   workOrderId: undefined,
-  itemId: undefined,
+  itemId: undefined
-  status: undefined,
-  receiptDate: undefined
 })
 const queryFormRef = ref()
 const formRef = ref()