diff --git a/src/api/mes/wm/productionissue/detail/index.ts b/src/api/mes/wm/productionissue/detail/index.ts
index 3d68b3661..ebc3843cb 100644
--- a/src/api/mes/wm/productionissue/detail/index.ts
+++ b/src/api/mes/wm/productionissue/detail/index.ts
@@ -21,9 +21,9 @@ export interface WmProductionIssueDetailVO {
 
 // MES 领料出库明细 API
 export const WmProductionIssueDetailApi = {
-  // 查询领料出库明细分页
-  getProductionIssueDetailPage: async (params: any) => {
-    return await request.get({ url: '/mes/wm/production-issue-detail/page', params })
+  // 查询领料出库明细列表（按行编号）
+  getProductionIssueDetailListByLineId: async (lineId: number) => {
+    return await request.get({ url: '/mes/wm/production-issue-detail/list-by-line', params: { lineId } })
   },
 
   // 查询领料出库明细详情
diff --git a/src/api/mes/wm/productionissue/index.ts b/src/api/mes/wm/productionissue/index.ts
index 332b05149..d564310ef 100644
--- a/src/api/mes/wm/productionissue/index.ts
+++ b/src/api/mes/wm/productionissue/index.ts
@@ -68,6 +68,11 @@ export const WmProductionIssueApi = {
     return await request.put({ url: '/mes/wm/production-issue/stock?id=' + id })
   },
 
+  // 取消领料出库单
+  cancelProductionIssue: async (id: number) => {
+    return await request.put({ url: '/mes/wm/production-issue/cancel?id=' + id })
+  },
+
   // 完成领料出库单（执行出库）
   finishProductionIssue: async (id: number) => {
     return await request.put({ url: '/mes/wm/production-issue/finish?id=' + id })
diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
index 68fdaa815..37168f357 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
@@ -47,7 +47,7 @@
           <el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
             删除
           </el-button>
-          <el-button v-if="isStock" link type="success" @click="handleShelving(scope.row.id)">
+          <el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
             上架
           </el-button>
         </template>
@@ -314,7 +314,7 @@ const setDetailListRef = (lineId: number, el: any) => {
 const detailFormRef = ref()
 
 /** 上架：直接打开明细创建表单 */
-const handleShelving = (lineId: number) => {
+const handleStock = (lineId: number) => {
   const row = list.value.find((r) => r.id === lineId)
   openDetailForm('create', lineId, row?.itemId)
 }
diff --git a/src/views/mes/wm/itemreceipt/index.vue b/src/views/mes/wm/itemreceipt/index.vue
index f51fce01b..e0ce049f0 100644
--- a/src/views/mes/wm/itemreceipt/index.vue
+++ b/src/views/mes/wm/itemreceipt/index.vue
@@ -26,19 +26,7 @@
         />
       </el-form-item>
       <el-form-item label="供应商" prop="vendorId">
-        <el-select
-          v-model="queryParams.vendorId"
-          placeholder="请选择供应商"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="vendor in vendorList"
-            :key="vendor.id"
-            :label="vendor.name"
-            :value="vendor.id"
-          />
-        </el-select>
+        <MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" />
       </el-form-item>
       <el-form-item label="入库日期" prop="receiptDate">
         <el-date-picker
@@ -174,7 +162,7 @@ import { dateFormatter2 } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import download from '@/utils/download'
 import { WmItemReceiptApi, WmItemReceiptVO } from '@/api/mes/wm/itemreceipt'
-import { MdVendorApi } from '@/api/mes/md/vendor'
+import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
 import ItemReceiptForm from './ItemReceiptForm.vue'
 import { MesWmItemReceiptStatusEnum } from '@/views/mes/utils/constants'
 
@@ -187,7 +175,6 @@ const loading = ref(true) // 列表的加载中
 const list = ref<WmItemReceiptVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const exportLoading = ref(false) // 导出的加载中
-const vendorList = ref<any[]>([]) // 供应商列表
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -282,8 +269,7 @@ const handleExport = async () => {
 }
 
 /** 初始化 */
-onMounted(async () => {
-  vendorList.value = await MdVendorApi.getVendorSimpleList()
-  await getList()
+onMounted(() => {
+  getList()
 })
 </script>
diff --git a/src/views/mes/wm/productionissue/ProductionIssueDetailList.vue b/src/views/mes/wm/productionissue/ProductionIssueDetailList.vue
index 1768e8a61..3553a6d4e 100644
--- a/src/views/mes/wm/productionissue/ProductionIssueDetailList.vue
+++ b/src/views/mes/wm/productionissue/ProductionIssueDetailList.vue
@@ -52,14 +52,8 @@ const list = ref<WmProductionIssueDetailVO[]>([]) // 明细列表
 /** 查询明细列表 */
 const getList = async () => {
   loading.value = true
-  // TODO @AI：走 list 接口，不需要分页；检查下；
   try {
-    const data = await WmProductionIssueDetailApi.getProductionIssueDetailPage({
-      pageNo: 1,
-      pageSize: 100,
-      lineId: props.lineId
-    })
-    list.value = data.list
+    list.value = await WmProductionIssueDetailApi.getProductionIssueDetailListByLineId(props.lineId)
   } finally {
     loading.value = false
   }
diff --git a/src/views/mes/wm/productionissue/ProductionIssueForm.vue b/src/views/mes/wm/productionissue/ProductionIssueForm.vue
index d94203b6a..d1749e4d8 100644
--- a/src/views/mes/wm/productionissue/ProductionIssueForm.vue
+++ b/src/views/mes/wm/productionissue/ProductionIssueForm.vue
@@ -107,9 +107,10 @@ const formData = ref({
   remark: undefined
 })
 const formRules = reactive({
-  // TODO @AI：你看下 workorderid、需求时间，必填；
   code: [{ required: true, message: '领料单编号不能为空', trigger: 'blur' }],
-  name: [{ required: true, message: '领料单名称不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '领料单名称不能为空', trigger: 'blur' }],
+  workOrderId: [{ required: true, message: '生产工单不能为空', trigger: 'change' }],
+  requiredTime: [{ required: true, message: '需求时间不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/mes/wm/productionissue/index.vue b/src/views/mes/wm/productionissue/index.vue
index d67ee7f7a..210907c3c 100644
--- a/src/views/mes/wm/productionissue/index.vue
+++ b/src/views/mes/wm/productionissue/index.vue
@@ -96,7 +96,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_PRODUCTION_ISSUE_STATUS" :value="scope.row.status" />
         </template>
@@ -151,6 +151,20 @@
           >
             完成
           </el-button>
+          <!-- 待拣货、待执行领出：取消 -->
+          <el-button
+            link
+            type="danger"
+            @click="handleCancel(scope.row.id)"
+            v-hasPermi="['mes:wm-production-issue:update']"
+            v-if="
+              [MesWmProductionIssueStatusEnum.APPROVING, MesWmProductionIssueStatusEnum.APPROVED].includes(
+                scope.row.status
+              )
+            "
+          >
+            取消
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -242,6 +256,16 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 取消按钮操作 */
+const handleCancel = async (id: number) => {
+  try {
+    await message.confirm('确认取消该领料出库单？取消后不可恢复。')
+    await WmProductionIssueApi.cancelProductionIssue(id)
+    message.success('取消成功')
+    await getList()
+  } catch {}
+}
+
 /** 完成按钮操作 */
 const handleFinish = async (id: number) => {
   try {