From 12c04def977075ecfc4c272c3b59e59801845c4b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Mar 2026 18:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=89=A9=E8=B5=84=E8=AE=B0=E5=BD=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=A4=84=E7=90=86=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/salesnotice/line/index.ts      |  1 -
 src/views/mes/utils/constants.ts              |  3 +-
 .../wm/salesnotice/SalesNoticeLineList.vue    | 60 +++----------------
 3 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/src/api/mes/wm/salesnotice/line/index.ts b/src/api/mes/wm/salesnotice/line/index.ts
index 252d546dd..19596bb01 100644
--- a/src/api/mes/wm/salesnotice/line/index.ts
+++ b/src/api/mes/wm/salesnotice/line/index.ts
@@ -5,7 +5,6 @@ export interface WmSalesNoticeLineVO {
   id: number
   noticeId: number
   itemId: number
-  materialStockId: number
   itemCode: string
   itemName: string
   specification: string
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index 61ee40b57..79f8cb8a8 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -370,8 +370,7 @@ export const MesWmProductSalesStatusEnum = {
 /** MES 发货通知单状态枚举 */
 export const MesWmSalesNoticeStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED
+  APPROVED: MesOrderStatusConstants.APPROVED
 }
 
 /** MES 装箱单状态枚举 */
diff --git a/src/views/mes/wm/salesnotice/SalesNoticeLineList.vue b/src/views/mes/wm/salesnotice/SalesNoticeLineList.vue
index 9c44d9672..7cd90ef09 100644
--- a/src/views/mes/wm/salesnotice/SalesNoticeLineList.vue
+++ b/src/views/mes/wm/salesnotice/SalesNoticeLineList.vue
@@ -24,13 +24,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" min-width="120" />
-      <el-table-column
-        v-if="isUpdate"
-        label="操作"
-        align="center"
-        width="120"
-        fixed="right"
-      >
+      <el-table-column v-if="isUpdate" label="操作" align="center" width="120" fixed="right">
         <template #default="scope">
           <el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
             编辑
@@ -60,13 +54,8 @@
     >
       <el-row>
         <el-col :span="8">
-          <el-form-item label="库存记录" prop="materialStockId">
-            <WmMaterialStockSelect
-              v-model="formData.materialStockId"
-              placeholder="请选择库存"
-              class="!w-1/1"
-              @change="handleStockChange"
-            />
+          <el-form-item label="物料" prop="itemId">
+            <MdItemSelect v-model="formData.itemId" placeholder="请选择物料" class="!w-1/1" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -74,25 +63,19 @@
             <el-input-number
               v-model="formData.quantity"
               :precision="2"
-              :min="0"
-              :max="quantityMax"
+              :min="0.01"
               controls-position="right"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="批次号">
-            <el-input :model-value="formData.batchCode" disabled placeholder="选择库存后自动带出" />
+          <el-form-item label="批次号" prop="batchCode">
+            <el-input v-model="formData.batchCode" placeholder="请输入批次号" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料">
-            <MdItemSelect v-model="formData.itemId" disabled />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="是否检验" prop="oqcCheckFlag">
             <el-switch v-model="formData.oqcCheckFlag" />
@@ -117,8 +100,6 @@
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
 import { WmSalesNoticeLineApi, WmSalesNoticeLineVO } from '@/api/mes/wm/salesnotice/line'
-import { WmMaterialStockVO } from '@/api/mes/wm/materialstock'
-import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 
 defineOptions({ name: 'SalesNoticeLineList' })
@@ -171,41 +152,21 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formLoading = ref(false)
 const lineFormType = ref('')
-const quantityMax = ref<number | undefined>(undefined)
 const formData = ref({
   id: undefined,
   noticeId: undefined as number | undefined,
-  materialStockId: undefined as number | undefined,
   itemId: undefined as number | undefined,
-  quantity: undefined as number | undefined,
-  batchId: undefined as number | undefined,
   batchCode: undefined as string | undefined,
+  quantity: undefined as number | undefined,
   oqcCheckFlag: true,
   remark: undefined
 })
 const formRules = reactive({
-  materialStockId: [{ required: true, message: '请选择库存记录', trigger: 'change' }],
+  itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
   quantity: [{ required: true, message: '发货数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref()
 
-/** 库存选中回调 —— 自动回填物料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
-    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
-}
-
 /** 打开表单弹窗 */
 const openForm = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -247,15 +208,12 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     noticeId: undefined,
-    materialStockId: undefined,
     itemId: undefined,
-    quantity: undefined,
-    batchId: undefined,
     batchCode: undefined,
+    quantity: undefined,
     oqcCheckFlag: true,
     remark: undefined
   }
-  quantityMax.value = undefined
   formRef.value?.resetFields()
 }