From 91b2fbb659d3b221f79f3740025cc6af325a81b3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Mar 2026 11:48:09 +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=E5=92=8C=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在退料单相关的多个类中新增库存记录 ID 和批次编码字段，以支持更精确的库存管理和数据校验。同时，更新了相关的表单和服务逻辑，确保新字段的正确使用和验证。
---
 src/api/mes/wm/returnissue/line/index.ts      |   4 +-
 src/views/mes/utils/constants.ts              |   1 +
 .../wm/returnissue/ReturnIssueDetailForm.vue  | 122 +++++++++++++-----
 .../mes/wm/returnissue/ReturnIssueForm.vue    |  10 +-
 .../wm/returnissue/ReturnIssueLineList.vue    |  76 ++++++++---
 5 files changed, 162 insertions(+), 51 deletions(-)

diff --git a/src/api/mes/wm/returnissue/line/index.ts b/src/api/mes/wm/returnissue/line/index.ts
index 981513781..342e29f23 100644
--- a/src/api/mes/wm/returnissue/line/index.ts
+++ b/src/api/mes/wm/returnissue/line/index.ts
@@ -9,9 +9,11 @@ export interface WmReturnIssueLineVO {
   itemName?: string
   specification?: string
   unitMeasureName?: string
+  materialStockId?: number
   quantity: number
   batchId?: number
-  qcFlag?: boolean
+  batchCode?: string
+  rqcCheckFlag?: boolean
   qualityStatus?: number
   rqcId?: number
   remark?: string
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index 5e61625c0..fd0608464 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -423,6 +423,7 @@ export const MesAutoCodeRuleCode = {
   WM_ITEM_RECEIPT_CODE: 'WM_ITEM_RECEIPT_CODE', // 采购入库单编码
   WM_RETURN_VENDOR_CODE: 'WM_RETURN_VENDOR_CODE', // 采购退货单编码
   WM_PRODUCT_ISSUE_CODE: 'WM_PRODUCT_ISSUE_CODE', // 生产领料出库单编码
+  WM_RETURN_ISSUE_CODE: 'WM_RETURN_ISSUE_CODE', // 生产退料单编码
   WM_SN_CODE: 'WM_SN_CODE', // SN 码
   WM_PACKAGE_CODE: 'WM_PACKAGE_CODE', // 装箱单编码
   WM_BATCH_CODE: 'WM_BATCH_CODE', // 批次编码
diff --git a/src/views/mes/wm/returnissue/ReturnIssueDetailForm.vue b/src/views/mes/wm/returnissue/ReturnIssueDetailForm.vue
index fe6180657..d0ec321c7 100644
--- a/src/views/mes/wm/returnissue/ReturnIssueDetailForm.vue
+++ b/src/views/mes/wm/returnissue/ReturnIssueDetailForm.vue
@@ -1,6 +1,6 @@
 <!-- MES 生产退料上架明细表单弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -8,33 +8,66 @@
       label-width="110px"
       v-loading="formLoading"
     >
-      <el-form-item label="物料" prop="itemId">
-        <MdItemSelect v-model="formData.itemId" disabled />
-      </el-form-item>
-      <el-form-item label="入库仓库" prop="warehouseId">
-        <WmWarehouseSelect v-model="formData.warehouseId" />
-      </el-form-item>
-      <el-form-item label="库区" prop="locationId" v-if="formData.warehouseId">
-        <WmWarehouseLocationSelect
-          v-model="formData.locationId"
-          :warehouse-id="formData.warehouseId"
-        />
-      </el-form-item>
-      <el-form-item label="库位" prop="areaId" v-if="formData.locationId">
-        <WmWarehouseAreaSelect v-model="formData.areaId" :location-id="formData.locationId" />
-      </el-form-item>
-      <el-form-item label="批次号" prop="batchCode">
-        <el-input v-model="formData.batchCode" placeholder="请输入批次号" />
-      </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-1/1"
-        />
-      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="物料" prop="itemId">
+            <MdItemSelect v-model="formData.itemId" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="库存记录" prop="materialStockId">
+            <WmMaterialStockSelect
+              v-model="formData.materialStockId"
+              :item-id="formData.itemId"
+              @change="handleStockChange"
+            />
+          </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"
+              :max="quantityMax"
+              controls-position="right"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="入库仓库" prop="warehouseId">
+            <WmWarehouseSelect v-model="formData.warehouseId" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="库区" prop="locationId">
+            <WmWarehouseLocationSelect
+              v-model="formData.locationId"
+              :warehouse-id="formData.warehouseId"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="库位" prop="areaId">
+            <WmWarehouseAreaSelect
+              v-model="formData.areaId"
+              :location-id="formData.locationId"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="批次号">
+            <el-input :model-value="formData.batchCode" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -48,7 +81,9 @@ import {
   WmReturnIssueDetailApi,
   WmReturnIssueDetailVO
 } from '@/api/mes/wm/returnissue/detail'
+import { WmMaterialStockVO } from '@/api/mes/wm/materialstock'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.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'
@@ -69,13 +104,16 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中
 const formType = ref('') // 表单的类型：create / update
 const currentLineId = ref<number>() // 当前操作的行 ID
+const quantityMax = ref<number | undefined>(undefined) // 数量上限（在库数量）
 const formRef = ref() // 表单 Ref
 const formData = ref({
   id: undefined as number | undefined,
   lineId: undefined as number | undefined,
   issueId: undefined as number | undefined,
   itemId: undefined as number | undefined,
+  materialStockId: undefined as number | undefined,
   quantity: undefined as number | undefined,
+  batchId: undefined as number | undefined,
   batchCode: undefined as string | undefined,
   warehouseId: undefined as number | undefined,
   locationId: undefined as number | undefined,
@@ -83,12 +121,31 @@ const formData = ref({
 })
 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' }],
+  materialStockId: [{ required: true, message: '请选择库存记录', trigger: 'change' }],
   quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
 })
 
+/** 库存选中回调 —— 自动回填仓库/库区/库位/批次/数量 */
+const handleStockChange = (stock: WmMaterialStockVO | undefined) => {
+  if (!stock) {
+    formData.value.warehouseId = undefined
+    formData.value.locationId = undefined
+    formData.value.areaId = undefined
+    formData.value.batchId = undefined
+    formData.value.batchCode = undefined
+    formData.value.quantity = undefined
+    quantityMax.value = undefined
+    return
+  }
+  formData.value.warehouseId = stock.warehouseId
+  formData.value.locationId = stock.locationId
+  formData.value.areaId = stock.areaId
+  formData.value.batchId = stock.batchId
+  formData.value.batchCode = stock.batchCode
+  formData.value.quantity = stock.quantity
+  quantityMax.value = stock.quantity
+}
+
 /** 打开弹窗 */
 const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => {
   dialogVisible.value = true
@@ -144,12 +201,15 @@ const resetForm = () => {
     lineId: undefined,
     issueId: undefined,
     itemId: undefined,
+    materialStockId: undefined,
     quantity: undefined,
+    batchId: undefined,
     batchCode: undefined,
     warehouseId: undefined,
     locationId: undefined,
     areaId: undefined
   }
+  quantityMax.value = undefined
   formRef.value?.resetFields()
 }
 </script>
diff --git a/src/views/mes/wm/returnissue/ReturnIssueForm.vue b/src/views/mes/wm/returnissue/ReturnIssueForm.vue
index 5cee0ad42..f2dca64c7 100644
--- a/src/views/mes/wm/returnissue/ReturnIssueForm.vue
+++ b/src/views/mes/wm/returnissue/ReturnIssueForm.vue
@@ -54,7 +54,6 @@
             <ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
           </el-form-item>
         </el-col>
-        <!-- TODO @芋艿：貌似前端不用选择；关注下； -->
         <el-col :span="8">
           <el-form-item label="工作站" prop="workstationId">
             <MdWorkstationSelect v-model="formData.workstationId" :disabled="isHeaderReadonly" />
@@ -103,8 +102,9 @@
 
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { generateRandomStr } from '@/utils'
 import { WmReturnIssueApi, WmReturnIssueVO } from '@/api/mes/wm/returnissue'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
 import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
 import ReturnIssueLineList from './ReturnIssueLineList.vue'
@@ -148,8 +148,10 @@ const dialogTitle = computed(() => {
 })
 
 /** 生成退料单编号 */
-const generateCode = () => {
-  formData.value.code = 'RI' + generateRandomStr(10)
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(
+    MesAutoCodeRuleCode.WM_RETURN_ISSUE_CODE
+  )
 }
 
 /** 打开弹窗 */
diff --git a/src/views/mes/wm/returnissue/ReturnIssueLineList.vue b/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
index 490a5e5df..5713ad643 100644
--- a/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
+++ b/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
@@ -32,7 +32,7 @@
       <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" />
-      <el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
+      <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column label="是否检测" align="center" prop="rqcCheckFlag" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.rqcCheckFlag" />
@@ -85,13 +85,12 @@
     >
       <el-row>
         <el-col :span="8">
-          <!-- TODO @芋艿：【StockSelect】需要使用库存选择器； -->
-          <el-form-item label="产品物料" prop="itemId">
-            <MdItemSelect
-              v-model="formData.itemId"
-              placeholder="请选择产品物料"
+          <el-form-item label="库存记录" prop="materialStockId">
+            <WmMaterialStockSelect
+              v-model="formData.materialStockId"
+              placeholder="请选择库存"
               class="!w-1/1"
-              @change="handleItemChange"
+              @change="handleStockChange"
             />
           </el-form-item>
         </el-col>
@@ -101,6 +100,7 @@
               v-model="formData.quantity"
               :precision="2"
               :min="0"
+              :max="quantityMax"
               controls-position="right"
               class="!w-1/1"
             />
@@ -112,6 +112,23 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="物料">
+            <el-input :model-value="stockInfo.itemName" disabled placeholder="选择库存后自动带出" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="批次号">
+            <el-input :model-value="formData.batchCode" disabled placeholder="选择库存后自动带出" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="库存数量">
+            <el-input :model-value="stockInfo.stockQuantity" disabled placeholder="选择库存后自动带出" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
@@ -139,7 +156,8 @@
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
 import { WmReturnIssueLineApi, WmReturnIssueLineVO } from '@/api/mes/wm/returnissue/line'
-import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import { WmMaterialStockVO } from '@/api/mes/wm/materialstock'
+import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
 import ReturnIssueDetailList from './ReturnIssueDetailList.vue'
 import ReturnIssueDetailForm from './ReturnIssueDetailForm.vue'
 import { BarcodeDetail } from '@/views/mes/wm/barcode/components'
@@ -196,25 +214,48 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中
 const lineFormType = ref('') // 行表单的类型
+const quantityMax = ref<number | undefined>(undefined) // 数量上限（在库数量）
+const stockInfo = ref({
+  itemName: undefined as string | undefined,
+  stockQuantity: undefined as number | undefined
+})
 const formData = ref({
   id: undefined,
   issueId: undefined as number | undefined,
-  itemId: undefined,
-  quantity: undefined,
+  itemId: undefined as number | undefined,
+  materialStockId: undefined as number | undefined,
+  quantity: undefined as number | undefined,
+  batchId: undefined as number | undefined,
+  batchCode: undefined as string | undefined,
   rqcCheckFlag: false,
   remark: undefined
 })
 const formRules = reactive({
-  itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
+  materialStockId: [{ required: true, message: '请选择库存记录', trigger: 'change' }],
   quantity: [{ required: true, message: '退料数量不能为空', trigger: 'blur' }],
   rqcCheckFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
-/** 物料变化时，自动填充信息 */
-const handleItemChange = (item: any) => {
-  if (item) {
-    formData.value.itemId = item.id
+/** 库存选中回调 —— 自动回填物料ID/批次/数量上限 */
+const handleStockChange = (stock: WmMaterialStockVO | undefined) => {
+  if (!stock) {
+    formData.value.itemId = undefined
+    formData.value.batchId = undefined
+    formData.value.batchCode = undefined
+    formData.value.quantity = undefined
+    quantityMax.value = undefined
+    stockInfo.value = { itemName: undefined, stockQuantity: undefined }
+    return
+  }
+  formData.value.itemId = stock.itemId
+  formData.value.batchId = stock.batchId
+  formData.value.batchCode = stock.batchCode
+  formData.value.quantity = stock.quantity
+  quantityMax.value = stock.quantity
+  stockInfo.value = {
+    itemName: stock.itemName || `物料 #${stock.itemId}`,
+    stockQuantity: stock.quantity
   }
 }
 
@@ -260,10 +301,15 @@ const resetForm = () => {
     id: undefined,
     issueId: undefined,
     itemId: undefined,
+    materialStockId: undefined,
     quantity: undefined,
+    batchId: undefined,
+    batchCode: undefined,
     rqcCheckFlag: false,
     remark: undefined
   }
+  quantityMax.value = undefined
+  stockInfo.value = { itemName: undefined, stockQuantity: undefined }
   formRef.value?.resetFields()
 }