From 7e3693d18c95e9ee8ae0a3e1e74531f0d5a6fddb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Mar 2026 20:35:23 +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=95ID=E5=92=8C=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在销售出库相关的多个数据对象中新增库存记录ID和收货地址字段，以支持更全面的出库信息管理。这些字段将帮助在出库单中更好地追踪库存和收货信息，提高系统的可用性和用户体验。
---
 src/views/mes/utils/constants.ts              |   3 +-
 .../productsales/ProductSalesDetailForm.vue   |  22 ++++
 .../mes/wm/productsales/ProductSalesForm.vue  |  34 ++++--
 .../wm/productsales/ProductSalesLineList.vue  |  27 ++++-
 src/views/mes/wm/productsales/index.vue       |  11 +-
 .../components/WmSalesNoticeLineSelect.vue    | 100 ++++++++++++++++++
 6 files changed, 185 insertions(+), 12 deletions(-)
 create mode 100644 src/views/mes/wm/salesnotice/components/WmSalesNoticeLineSelect.vue

diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index c70c65827..93c645820 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -437,7 +437,8 @@ export const MesAutoCodeRuleCode = {
   QC_RQC_CODE: 'QC_RQC_CODE', // 退货检验单编码
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE', // 仓库编码
   WM_LOCATION_CODE: 'WM_LOCATION_CODE', // 库区编码
-  WM_AREA_CODE: 'WM_AREA_CODE' // 库位编码
+  WM_AREA_CODE: 'WM_AREA_CODE', // 库位编码
+  WM_PRODUCT_SALES_CODE: 'WM_PRODUCT_SALES_CODE' // 销售出库单编码
 } as const
 
 /** 获取物料/产品标识的标签 */
diff --git a/src/views/mes/wm/productsales/ProductSalesDetailForm.vue b/src/views/mes/wm/productsales/ProductSalesDetailForm.vue
index 0a2079398..c391598c4 100644
--- a/src/views/mes/wm/productsales/ProductSalesDetailForm.vue
+++ b/src/views/mes/wm/productsales/ProductSalesDetailForm.vue
@@ -11,6 +11,13 @@
       <el-form-item label="物料" prop="itemId">
         <MdItemSelect v-model="formData.itemId" disabled />
       </el-form-item>
+      <el-form-item label="选择库存" prop="materialStockId">
+        <WmMaterialStockSelect
+          v-model="formData.materialStockId"
+          :item-id="formData.itemId"
+          @change="handleStockChange"
+        />
+      </el-form-item>
       <el-form-item label="出库仓库" prop="warehouseId">
         <WmWarehouseSelect v-model="formData.warehouseId" />
       </el-form-item>
@@ -54,6 +61,7 @@ import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSe
 import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
 import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
 import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
+import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
 
 defineOptions({ name: 'ProductSalesDetailForm' })
 
@@ -78,6 +86,7 @@ const formData = ref({
   salesId: undefined as number | undefined,
   itemId: undefined as number | undefined,
   quantity: undefined as number | undefined,
+  materialStockId: undefined as number | undefined,
   warehouseId: undefined as number | undefined,
   locationId: undefined as number | undefined,
   areaId: undefined as number | undefined,
@@ -118,6 +127,18 @@ const handleBatchChange = (batch: any) => {
   formData.value.batchCode = batch?.code
 }
 
+/** 库存选中回调，自动填充仓库/库区/库位/批次 */
+// TODO @AI：参考下别的模块 handleStockChange；有不同的逻辑；对齐下；
+const handleStockChange = (stock: any) => {
+  if (stock) {
+    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
+  }
+}
+
 /** 提交表单 */
 const submitForm = async () => {
   // 校验表单
@@ -153,6 +174,7 @@ const resetForm = () => {
     salesId: undefined,
     itemId: undefined,
     quantity: undefined,
+    materialStockId: undefined,
     warehouseId: undefined,
     locationId: undefined,
     areaId: undefined,
diff --git a/src/views/mes/wm/productsales/ProductSalesForm.vue b/src/views/mes/wm/productsales/ProductSalesForm.vue
index 4dcdc5d42..5e06459a6 100644
--- a/src/views/mes/wm/productsales/ProductSalesForm.vue
+++ b/src/views/mes/wm/productsales/ProductSalesForm.vue
@@ -16,9 +16,7 @@
               :disabled="isHeaderReadonly"
             >
               <template #append>
-                <el-button @click="generateCode">
-                  生成
-                </el-button>
+                <el-button @click="generateCode"> 生成 </el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -32,6 +30,7 @@
             />
           </el-form-item>
         </el-col>
+        <!-- TODO @AI：选择完后，自动填写 salesOrderCode、客户 -->
         <el-col :span="8">
           <el-form-item label="发货通知单" prop="noticeId">
             <WmSalesNoticeSelect v-model="formData.noticeId" :disabled="isHeaderReadonly" />
@@ -39,8 +38,6 @@
         </el-col>
       </el-row>
       <el-row>
-        <!-- DONE @芋艿：【暂时先忽略我这个想法】销售订单编号、出库日期，是不是不用记录 -->
-        <!-- DONE @芋艿：【暂时先忽略我这个想法】目前发货通知单选择后，可设置销售订单比那好、出库日期、客户；（和上面这个 DONE 有关联）（暂时保持手动填写，未来可考虑自动填充） -->
         <el-col :span="8">
           <el-form-item label="销售订单编号" prop="salesOrderCode">
             <el-input
@@ -87,6 +84,15 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="收货地址" prop="address">
+            <el-input
+              v-model="formData.address"
+              placeholder="请输入收货地址"
+              :disabled="isHeaderReadonly"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -100,6 +106,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- TODO @AI：可能要某个状态下，才进行展示； -->
       <el-divider content-position="left">运输信息</el-divider>
       <el-row>
         <el-col :span="8">
@@ -125,7 +132,11 @@
     <!-- 非新建模式展示行项目信息（出库物料） -->
     <template v-if="formData.id">
       <el-divider content-position="center">物料信息</el-divider>
-      <ProductSalesLineList :sales-id="formData.id" :form-type="formType" />
+      <ProductSalesLineList
+        :sales-id="formData.id"
+        :notice-id="formData.noticeId"
+        :form-type="formType"
+      />
     </template>
     <template #footer>
       <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
@@ -143,8 +154,9 @@
 </template>
 
 <script setup lang="ts">
-import { generateRandomStr } from '@/utils'
 import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
+import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
 import WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue'
 import ProductSalesLineList from './ProductSalesLineList.vue'
@@ -166,6 +178,7 @@ const formData = ref({
   salesDate: undefined,
   contactName: undefined,
   contactTelephone: undefined,
+  address: undefined,
   carrier: undefined,
   shippingNumber: undefined,
   remark: undefined
@@ -194,8 +207,10 @@ const dialogTitle = computed(() => {
 })
 
 /** 生成出库单编号 */
-const generateCode = () => {
-  formData.value.code = 'PS' + generateRandomStr(10)
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(
+    MesAutoCodeRuleCode.WM_PRODUCT_SALES_CODE
+  )
 }
 
 /** 打开弹窗 */
@@ -291,6 +306,7 @@ const resetForm = () => {
     salesDate: undefined,
     contactName: undefined,
     contactTelephone: undefined,
+    address: undefined,
     carrier: undefined,
     shippingNumber: undefined,
     remark: undefined
diff --git a/src/views/mes/wm/productsales/ProductSalesLineList.vue b/src/views/mes/wm/productsales/ProductSalesLineList.vue
index 1088ac8c1..53045c582 100644
--- a/src/views/mes/wm/productsales/ProductSalesLineList.vue
+++ b/src/views/mes/wm/productsales/ProductSalesLineList.vue
@@ -83,9 +83,18 @@
       v-loading="formLoading"
     >
       <el-row>
+        <el-col :span="8" v-if="hasNoticeId">
+          <el-form-item label="发货通知单行" prop="noticeLineId">
+            <WmSalesNoticeLineSelect
+              v-model="formData.noticeLineId"
+              :notice-id="props.noticeId"
+              @change="handleNoticeLineChange"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="产品" prop="itemId">
-            <MdItemSelect v-model="formData.itemId" placeholder="请选择产品" class="!w-1/1" />
+            <MdItemSelect v-model="formData.itemId" placeholder="请选择产品" class="!w-1/1" :disabled="!!formData.noticeLineId" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -145,6 +154,7 @@
 import { WmProductSalesLineApi, WmProductSalesLineVO } from '@/api/mes/wm/productsales/line'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
+import WmSalesNoticeLineSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeLineSelect.vue'
 import ProductSalesDetailList from './ProductSalesDetailList.vue'
 import ProductSalesDetailForm from './ProductSalesDetailForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
@@ -153,6 +163,7 @@ defineOptions({ name: 'ProductSalesLineList' })
 
 const props = defineProps<{
   salesId: number
+  noticeId?: number
   formType: string
 }>()
 
@@ -161,6 +172,7 @@ const message = useMessage() // 消息弹窗
 
 const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
 const isPick = computed(() => props.formType === 'pick') // 是否为拣货模式
+const hasNoticeId = computed(() => !!props.noticeId) // 是否有关联的发货通知单
 
 // ==================== 列表 ====================
 const loading = ref(false) // 列表的加载中
@@ -203,6 +215,7 @@ const lineFormType = ref('') // 行表单的类型
 const formData = ref({
   id: undefined,
   salesId: undefined as number | undefined,
+  noticeLineId: undefined as number | undefined,
   itemId: undefined,
   quantity: undefined,
   batchId: undefined as number | undefined,
@@ -237,6 +250,17 @@ const handleBatchChange = (batch: any) => {
   formData.value.batchCode = batch?.code
 }
 
+/** 发货通知单行变化时，自动填充物料信息 */
+const handleNoticeLineChange = (line: any) => {
+  if (line) {
+    formData.value.itemId = line.itemId
+    formData.value.quantity = line.quantity
+    formData.value.batchId = line.batchId
+    formData.value.batchCode = line.batchCode
+    formData.value.oqcCheckFlag = line.oqcCheckFlag ?? false
+  }
+}
+
 /** 提交表单 */
 const submitForm = async () => {
   await formRef.value.validate()
@@ -262,6 +286,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     salesId: undefined,
+    noticeLineId: undefined,
     itemId: undefined,
     quantity: undefined,
     batchId: undefined,
diff --git a/src/views/mes/wm/productsales/index.vue b/src/views/mes/wm/productsales/index.vue
index 41ad39302..6e97d29c0 100644
--- a/src/views/mes/wm/productsales/index.vue
+++ b/src/views/mes/wm/productsales/index.vue
@@ -49,7 +49,12 @@
         />
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择单据状态"
+          clearable
+          class="!w-240px"
+        >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS)"
             :key="dict.value"
@@ -84,6 +89,7 @@
 
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <!-- TODO @AI：增加【详情】，通过 code 打开； -->
       <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="noticeCode" min-width="160" />
@@ -92,6 +98,7 @@
       <el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
       <el-table-column label="收货人" align="center" prop="contactName" min-width="100" />
       <el-table-column label="联系方式" align="center" prop="contactTelephone" min-width="120" />
+      <el-table-column label="收货地址" align="center" prop="address" min-width="180" />
       <el-table-column label="承运商" align="center" prop="carrier" min-width="120" />
       <el-table-column label="运输单号" align="center" prop="shippingNumber" min-width="160" />
       <el-table-column
@@ -118,6 +125,7 @@
           >
             编辑
           </el-button>
+          <!-- TODO @AI：对齐 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/itemreceipt 交互 -->
           <el-button
             link
             type="warning"
@@ -157,6 +165,7 @@
             填写运单
           </el-button>
           <!-- 待出库：执行出库、取消 -->
+          <!-- TODO @AI：对齐 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/itemreceipt 交互 -->
           <el-button
             link
             type="primary"
diff --git a/src/views/mes/wm/salesnotice/components/WmSalesNoticeLineSelect.vue b/src/views/mes/wm/salesnotice/components/WmSalesNoticeLineSelect.vue
new file mode 100644
index 000000000..0e93daf8e
--- /dev/null
+++ b/src/views/mes/wm/salesnotice/components/WmSalesNoticeLineSelect.vue
@@ -0,0 +1,100 @@
+<!-- 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>
+        <el-tag size="small" type="info" class="ml-4px">{{ item.quantity }}</el-tag>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { WmSalesNoticeLineApi, WmSalesNoticeLineVO } from '@/api/mes/wm/salesnotice/line'
+
+defineOptions({ name: 'WmSalesNoticeLineSelect' })
+
+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: WmSalesNoticeLineVO | undefined]
+}>()
+
+const allList = ref<WmSalesNoticeLineVO[]>([])
+const filteredList = ref<WmSalesNoticeLineVO[]>([])
+
+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
+  }
+  const data = await WmSalesNoticeLineApi.getSalesNoticeLinePage({
+    pageNo: 1,
+    pageSize: 100,
+    noticeId: props.noticeId
+  })
+  allList.value = data.list
+  filteredList.value = allList.value
+}
+
+/** 监听 noticeId 变化重新加载 */
+watch(() => props.noticeId, () => {
+  loadList()
+})
+
+onMounted(() => {
+  loadList()
+})
+</script>