diff --git a/src/api/erp/stock/check/index.ts b/src/api/erp/stock/check/index.ts
index 9de3a893..79482fb9 100644
--- a/src/api/erp/stock/check/index.ts
+++ b/src/api/erp/stock/check/index.ts
@@ -6,9 +6,11 @@ export interface StockCheckVO {
   no: string // 盘点单号
   checkTime: Date | string // 盘点时间
   sourceType?: number | string // 生成来源类型：1-按库存，2-按产品
+  categoryType?: number | string // 分类
   totalCount: number // 合计数量
   totalPrice: number // 合计金额，单位：元
   status: number // 状态
+  checkStatus?: number | string // 盘点状态：0-未盘点，1-已盘点
   auditUserId?: number // 审核人编号
   auditUserName?: string // 审核人名称
   remark?: string // 备注
@@ -95,6 +97,16 @@ export const StockCheckApi = {
     })
   },
 
+  // 提交库存盘点单
+  submitStockCheck: async (data: { id: number; auditUserId?: number; remark?: string }) => {
+    return await request.put({ url: `/erp/stock-check/submit`, data })
+  },
+
+  // 审核库存盘点单
+  auditStockCheck: async (data: { id: number; status: number; remark?: string }) => {
+    return await request.put({ url: `/erp/stock-check/audit`, data })
+  },
+
   // 删除库存盘点单
   deleteStockCheck: async (ids: number[]) => {
     return await request.delete({
diff --git a/src/api/erp/stock/pallet/index.ts b/src/api/erp/stock/pallet/index.ts
new file mode 100644
index 00000000..7bc31c2b
--- /dev/null
+++ b/src/api/erp/stock/pallet/index.ts
@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+export interface PalletVO {
+  id?: number
+  code?: string
+  isCode?: boolean
+  palletType?: number | string
+  specification?: string
+  ratedLoadWeight?: number | string
+  unit?: string
+  status?: number | string
+  warehouseId?: number | string
+  areaId?: number | string
+  planCode?: string
+  productId?: number | string
+  productCount?: number | string
+  qrcode?: string
+  purchaseDate?: string
+  useDate?: string
+  remark?: string
+  createTime?: string
+}
+
+export const PalletApi = {
+  getPalletPage: async (params: any) => {
+    return await request.get({ url: `/erp/pallet/page`, params })
+  },
+
+  createPallet: async (data: PalletVO) => {
+    return await request.post({ url: `/erp/pallet/create`, data })
+  },
+
+  updatePallet: async (params: PalletVO) => {
+    return await request.put({ url: `/erp/pallet/update`, params })
+  },
+
+  deletePallet: async (id: number) => {
+    return await request.delete({ url: `/erp/pallet/delete?id=` + id })
+  }
+}
diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts
index 1fdc8407..4770783b 100644
--- a/src/api/mes/task/index.ts
+++ b/src/api/mes/task/index.ts
@@ -118,6 +118,11 @@ export const TaskApi = {
     return await request.get({ url: `/mes/task/task-detail/summary?taskId=` + taskId })
   },
 
+  // 获取生产任务单默认包装方案
+  getTaskDefaultPackagingSchemes: async (taskId: number) => {
+    return await request.get({ url: `/mes/task/task-detail/default-packaging-schemes`, params: { taskId } })
+  },
+
   // 获得可查询计划的生产任务单列表
   getTaskList: async () => {
     return await request.get({ url: `/mes/task/getTaskList`})
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 0d66d18f..c1f74466 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -345,6 +345,67 @@
       validatorAllowBatchMixRequired: 'Allow batch mix is required',
       validatorStatusRequired: 'Status is required'
     },
+    Overview: {
+      materialCategory: 'Material Category',
+      location: 'Location',
+      dateRange: 'Date Range',
+      stockDetail: 'Stock Detail',
+      recentRecord: 'Recent Stock Records',
+      more: 'More',
+      time: 'Time',
+      material: 'Material',
+      latestChangeTime: 'Latest Change Time',
+      stockIn: 'Inbound',
+      stockOut: 'Outbound',
+      cards: {
+        finishedGoods: {
+          title: 'Finished Goods Stock',
+          line1: 'SKU: 36',
+          line2: 'Stock Summary: 128 pallets 42 packs 560 pcs',
+          line3: 'Completed Inbound Today: 12 pallets 8 packs',
+          tip: 'Converted by product packaging scheme'
+        },
+        rawMaterial: {
+          title: 'Raw Material Stock',
+          line1: 'Materials: 24 types',
+          line2: 'Weight: 18.6 tons',
+          line3: 'Liquid: 1,250 L',
+          line4: 'Pack/Box: 86 drums / 320 packs',
+          tip: 'Summarized by material measurement mode'
+        },
+        sparePart: {
+          title: 'Spare Parts Stock',
+          line1: 'Spare Parts: 128 types',
+          line2: 'Low Stock: 8 items',
+          line3: 'Common Parts: 36 items',
+          line4: 'Sample Stock: cable ties 9 packs 70 pcs',
+          tip: 'Stock is stored by minimum unit with auxiliary conversion'
+        },
+        todayIn: {
+          title: 'Inbound Today',
+          line1: 'Inbound Orders: 18',
+          line2: 'Detail Lines: 46',
+          line3: 'Finished Goods: 12 pallets 8 packs',
+          line4: 'Raw Materials: 3 pallets / 1.2 tons',
+          line5: 'Spare Parts: 6 packs / 120 pcs'
+        },
+        todayOut: {
+          title: 'Outbound Today',
+          line1: 'Outbound Orders: 15',
+          line2: 'Detail Lines: 38',
+          line3: 'Raw Material Issue: 820 kg',
+          line4: 'Spare Parts Issue: 45 pcs',
+          line5: 'Finished Goods Shipment: 6 pallets 20 packs'
+        },
+        warning: {
+          title: 'Stock Alerts',
+          line1: 'Alerts: 18',
+          line2: 'Raw Materials: 5',
+          line3: 'Spare Parts: 10',
+          line4: 'Finished Goods: 3'
+        }
+      }
+    },
     Stock: {
       product: 'Product',
       warehouse: 'Warehouse',
@@ -499,11 +560,27 @@
       purchaseUnitConvertQuantity: 'Purchase Convert Qty',
       defaultSupplier: 'Supplier (Default)',
       outboundPurpose: 'Outbound Purpose',
+      outMode: 'Outbound Mode',
+      outModeWholePallet: 'Whole Pallet',
+      outModeSplitPallet: 'Split Pallet',
       relatedOrder: 'Related Order',
       relatedRepairOrder: 'Related Repair Order',
       relatedMaintainRecord: 'Related Maintenance Record',
+      relatedTask: 'Related Task',
+      taskOrder: 'Task Order',
+      palletCode: 'Pallet Code',
+      availablePallets: 'Available Pallets',
+      selectedPallets: 'Selected Pallets',
+      packageCount: 'Package Count',
+      itemCount: 'Item Count',
+      productInfo: 'Product Info',
+      productName: 'Product Name',
+      packagingScheme: 'Packaging Scheme',
+      packageItemCount: 'Package Item Count',
       selectRelatedRepairOrder: 'Select Repair Order',
       selectRelatedMaintainRecord: 'Select Maintenance Record',
+      selectTaskOrder: 'Select Task Order',
+      selectPalletCode: 'Select Pallet Code',
       inputUnitType: 'Unit Input Type',
       inputCount: 'Purchase Unit Quantity',
       count: 'Quantity',
@@ -511,6 +588,8 @@
       totalPrice: 'Total Price',
       remark: 'Remark',
       action: 'Action',
+      selector: 'Select',
+      selectProduct: 'Select Product',
       selectCode: 'Select Code',
       code: 'Code',
       name: 'Name',
@@ -523,12 +602,19 @@
       placeholderOutboundPurpose: 'Please select outbound purpose',
       placeholderRelatedRepairOrder: 'Please select related repair order',
       placeholderRelatedMaintainRecord: 'Please select related maintenance record',
+      placeholderTaskOrder: 'Please select task order',
+      placeholderPalletCode: 'Please select pallet code',
       placeholderInputUnitType: 'Please select',
       placeholderCode: 'Please enter code',
       placeholderName: 'Please enter name',
       validatorWarehouseRequired: 'Warehouse is required',
       validatorAreaRequired: 'Please select area',
       validatorProductRequired: 'Product is required',
+      validatorTaskRequired: 'Task order is required',
+      validatorPalletRequired: 'Pallet code is required',
+      validatorPackageCountRequired: 'Package count is required and must be greater than 0',
+      validatorOutboundPurposeRequired: 'Outbound purpose is required',
+      validatorOutModeRequired: 'Outbound mode is required',
       validatorCountRequired: 'Quantity is required',
       stockCountExceededWarning: 'Quantity cannot exceed stock. It has been adjusted to stock quantity.'
     },
@@ -545,13 +631,25 @@
       price: 'Amount',
       totalPrice: 'Total Price',
       sourceType: 'Source Type',
+      categoryType: 'Category',
       sourceTypeStock: 'By Stock',
       sourceTypeProduct: 'By Product',
       area: 'Area',
       checkItem: 'Check Item',
       stockCount: 'Stock Quantity',
       actualCount: 'Actual Count',
+      differenceCount: 'Difference',
       inventoryCheck: 'Check',
+      saveDraft: 'Save Draft',
+      checkStatus: 'Check Status',
+      checkStatusUnchecked: 'Unchecked',
+      checkStatusChecked: 'Checked',
+      submit: 'Submit',
+      submitRemark: 'Submit Remark',
+      auditRemark: 'Audit Remark',
+      auditUserName: 'Auditor',
+      auditApprove: 'Pass',
+      auditReject: 'Reject',
       materialCategory: 'Material Category',
       materialSubCategory: 'Material Subcategory',
       standard: 'Standard',
@@ -569,20 +667,30 @@
       placeholderCheckItem: 'Please select check item',
       placeholderProductBarCode: 'Please enter material code',
       placeholderProductName: 'Please enter material name',
+      placeholderAuditUser: 'Please select auditor',
+      placeholderSubmitRemark: 'Please enter submit remark',
+      placeholderAuditRemark: 'Please enter audit remark',
       placeholderCreator: 'Please select creator',
       placeholderStatus: 'Please select status',
       placeholderRemark: 'Please enter remark',
       placeholderCheckTime: 'Select check time',
       validatorCheckTimeRequired: 'Check time is required',
       validatorSourceTypeRequired: 'Please select source type',
+      validatorCategoryTypeRequired: 'Please select category',
       validatorSelectWarehouseFirst: 'Please select warehouse first',
       validatorSelectAreaFirst: 'Please select area first',
       validatorSelectProductFirst: 'Please select product first',
       validatorSelectCheckItem: 'Please select check item',
+      validatorAuditUserRequired: 'Please select auditor',
+      validatorCompleteCheckInfo: 'Please complete check information first',
+      confirmActualCountZero: ' actual count is 0. Confirm submit?',
       confirmApprove: 'Are you sure to approve this check order?',
       confirmReverseApprove: 'Are you sure to reverse approve this check order?',
+      submitSuccess: 'Submit success',
       approveSuccess: 'Approve success',
       reverseApproveSuccess: 'Reverse approve success',
+      auditApproveSuccess: 'Pass success',
+      auditRejectSuccess: 'Reject success',
       exportName: 'Check Order.xls',
       list: 'Check Product List',
       addItem: 'Add Check Product',
@@ -693,6 +801,47 @@
       validatorPackageQuantityRequired: 'Package quantity is required',
       validatorPalletPackageQuantityRequired: 'Pallet package quantity is required',
       validatorStatusRequired: 'Status is required'
+    },
+    Pallet: {
+      code: 'Pallet Code',
+      palletType: 'Pallet Type',
+      specification: 'Specification',
+      ratedLoadWeight: 'Rated Load',
+      unit: 'Unit',
+      status: 'Pallet Status',
+      warehouseId: 'Warehouse',
+      areaId: 'Area',
+      planCode: 'Production Task No.',
+      productId: 'Product ID',
+      productCount: 'Product Quantity',
+      qrcode: 'QR Code',
+      viewQrcode: 'View QR Code',
+      qrcodeEmpty: 'No QR code',
+      qrcodeRefreshConfirm: 'Confirm to refresh this pallet QR code?',
+      purchaseDate: 'Purchase Date',
+      useDate: 'Use Date',
+      remark: 'Remark',
+      createTime: 'Create Time',
+      placeholderCode: 'Please enter pallet code',
+      placeholderPalletType: 'Please enter pallet type',
+      placeholderSpecification: 'Please enter pallet specification',
+      placeholderLength: 'Length',
+      placeholderWidth: 'Width',
+      placeholderHeight: 'Height',
+      placeholderRatedLoadWeight: 'Please enter rated load',
+      placeholderUnit: 'Please enter unit',
+      placeholderStatus: 'Please select pallet status',
+      placeholderWarehouseId: 'Please select warehouse',
+      placeholderAreaId: 'Please select area',
+      placeholderPlanCode: 'Please enter production task no.',
+      placeholderProductId: 'Please select product',
+      placeholderProductCount: 'Please enter product quantity',
+      placeholderPurchaseDate: 'Please select purchase date',
+      placeholderUseDate: 'Please select use date',
+      placeholderRemark: 'Please enter remark',
+      validatorCodeRequired: 'Pallet code is required',
+      validatorPalletTypeRequired: 'Pallet type is required',
+      validatorStatusRequired: 'Pallet status is required'
     }
   },
   ErpPurchase: {
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 431118c7..bed5862d 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -345,6 +345,67 @@
       validatorAllowBatchMixRequired: '是否允许批次混放不能为空',
       validatorStatusRequired: '开启状态不能为空'
     },
+    Overview: {
+      materialCategory: '物料大类',
+      location: '库位',
+      dateRange: '日期范围',
+      stockDetail: '库存明细',
+      recentRecord: '最近库存流水',
+      more: '更多',
+      time: '时间',
+      material: '物料',
+      latestChangeTime: '最近变动时间',
+      stockIn: '入库',
+      stockOut: '出库',
+      cards: {
+        finishedGoods: {
+          title: '产成品库存',
+          line1: 'SKU：36',
+          line2: '库存摘要：128托 42包 560个',
+          line3: '今日完工入库：12托 8包',
+          tip: '按产品包装方案换算展示'
+        },
+        rawMaterial: {
+          title: '原材料库存',
+          line1: '物料：24种',
+          line2: '重量类：18.6吨',
+          line3: '液体类：1,250L',
+          line4: '包/箱类：86桶 / 320包',
+          tip: '按物料档案计量方式分别汇总'
+        },
+        sparePart: {
+          title: '备件库存',
+          line1: '备件：128种',
+          line2: '低库存：8项',
+          line3: '常用件：36项',
+          line4: '示例库存：扎带 9包70根',
+          tip: '库存按最小单位保存，页面辅助换算展示'
+        },
+        todayIn: {
+          title: '今日入库',
+          line1: '入库单：18张',
+          line2: '明细行：46行',
+          line3: '产成品：12托8包',
+          line4: '原材料：3托 / 1.2吨',
+          line5: '备件：6包 / 120个'
+        },
+        todayOut: {
+          title: '今日出库',
+          line1: '出库单：15张',
+          line2: '明细行：38行',
+          line3: '原材料领用：820kg',
+          line4: '备件领用：45个',
+          line5: '产成品发货：6托20包'
+        },
+        warning: {
+          title: '库存预警',
+          line1: '预警：18条',
+          line2: '原材料：5',
+          line3: '备件：10',
+          line4: '产成品：3'
+        }
+      }
+    },
     Stock: {
       product: '产品',
       warehouse: '仓库',
@@ -499,11 +560,27 @@
       purchaseUnitConvertQuantity: '采购换算数量',
       defaultSupplier: '供应商（默认）',
       outboundPurpose: '出库用途',
+      outMode: '出库方式',
+      outModeWholePallet: '整托出库',
+      outModeSplitPallet: '拆托出库',
       relatedOrder: '关联单据',
       relatedRepairOrder: '关联维修单',
       relatedMaintainRecord: '关联保养记录',
+      relatedTask: '关联任务单',
+      taskOrder: '任务单',
+      palletCode: '托盘码',
+      availablePallets: '可选托盘',
+      selectedPallets: '已选托盘',
+      packageCount: '包数',
+      itemCount: '个数',
+      productInfo: '产品信息',
+      productName: '产品名称',
+      packagingScheme: '包装方案',
+      packageItemCount: '每包个数',
       selectRelatedRepairOrder: '选择维修单',
       selectRelatedMaintainRecord: '选择保养记录',
+      selectTaskOrder: '选择任务单',
+      selectPalletCode: '选择托盘码',
       inputUnitType: '单位输入方式',
       inputCount: '采购单位数量',
       count: '数量',
@@ -511,6 +588,8 @@
       totalPrice: '合计金额',
       remark: '备注',
       action: '操作',
+      selector: '选择',
+      selectProduct: '选择产品',
       selectCode: '选择编码',
       code: '编码',
       name: '名称',
@@ -523,12 +602,19 @@
       placeholderOutboundPurpose: '请选择出库用途',
       placeholderRelatedRepairOrder: '请选择关联维修单',
       placeholderRelatedMaintainRecord: '请选择关联保养记录',
+      placeholderTaskOrder: '请选择任务单',
+      placeholderPalletCode: '请选择托盘码',
       placeholderInputUnitType: '请选择',
       placeholderCode: '请输入编码',
       placeholderName: '请输入名称',
       validatorWarehouseRequired: '仓库不能为空',
       validatorAreaRequired: '请选择库区',
       validatorProductRequired: '产品不能为空',
+      validatorTaskRequired: '任务单不能为空',
+      validatorPalletRequired: '托盘码不能为空',
+      validatorPackageCountRequired: '包数不能为空且必须大于0',
+      validatorOutboundPurposeRequired: '出库用途不能为空',
+      validatorOutModeRequired: '出库方式不能为空',
       validatorCountRequired: '产品数量不能为空',
       stockCountExceededWarning: '数量不能超出库存，已自动调整为库存数量'
     },
@@ -545,13 +631,25 @@
       price: '金额',
       totalPrice: '合计金额',
       sourceType: '生成来源',
+      categoryType: '分类',
       sourceTypeStock: '按库存',
       sourceTypeProduct: '按产品',
       area: '库区',
       checkItem: '盘点项',
       stockCount: '库存数量',
       actualCount: '实盘数量',
+      differenceCount: '差异',
       inventoryCheck: '盘点',
+      saveDraft: '保存草稿',
+      checkStatus: '盘点状态',
+      checkStatusUnchecked: '未盘点',
+      checkStatusChecked: '已盘点',
+      submit: '提交',
+      submitRemark: '提交备注',
+      auditRemark: '审核备注',
+      auditUserName: '审核人',
+      auditApprove: '通过',
+      auditReject: '驳回',
       materialCategory: '物料大类',
       materialSubCategory: '物料小类',
       standard: '规格',
@@ -569,20 +667,30 @@
       placeholderCheckItem: '请选择盘点项',
       placeholderProductBarCode: '请输入物料编码',
       placeholderProductName: '请输入物料名称',
+      placeholderAuditUser: '请选择审核人',
+      placeholderSubmitRemark: '请输入提交备注',
+      placeholderAuditRemark: '请输入审核备注',
       placeholderCreator: '请选择创建人',
       placeholderStatus: '请选择状态',
       placeholderRemark: '请输入备注',
       placeholderCheckTime: '选择盘点时间',
       validatorCheckTimeRequired: '盘点时间不能为空',
       validatorSourceTypeRequired: '请选择生成来源',
+      validatorCategoryTypeRequired: '请选择分类',
       validatorSelectWarehouseFirst: '请先选择仓库',
       validatorSelectAreaFirst: '请先选择库区',
       validatorSelectProductFirst: '请先选择产品',
       validatorSelectCheckItem: '请选择盘点项',
+      validatorAuditUserRequired: '请选择审核人',
+      validatorCompleteCheckInfo: '请先完善盘点信息',
+      confirmActualCountZero: '实盘数量为0，确认提交吗？',
       confirmApprove: '确定审批该盘点单吗？',
       confirmReverseApprove: '确定反审批该盘点单吗？',
+      submitSuccess: '提交成功',
       approveSuccess: '审批成功',
       reverseApproveSuccess: '反审批成功',
+      auditApproveSuccess: '通过成功',
+      auditRejectSuccess: '驳回成功',
       exportName: '其它盘点单.xls',
       list: '盘点产品物料清单',
       addItem: '添加盘点产品',
@@ -693,6 +801,47 @@
       validatorPackageQuantityRequired: '每包数量不能为空',
       validatorPalletPackageQuantityRequired: '每托包数不能为空',
       validatorStatusRequired: '状态不能为空'
+    },
+    Pallet: {
+      code: '托盘编码',
+      palletType: '托盘类型',
+      specification: '规格',
+      ratedLoadWeight: '额定载重',
+      unit: '单位',
+      status: '托盘状态',
+      warehouseId: '所属仓库',
+      areaId: '所属库区',
+      planCode: '生产任务单号',
+      productId: '产品编号',
+      productCount: '产品数量',
+      qrcode: '二维码',
+      viewQrcode: '查看二维码',
+      qrcodeEmpty: '暂无二维码',
+      qrcodeRefreshConfirm: '确认刷新该托盘二维码吗？',
+      purchaseDate: '采购日期',
+      useDate: '启用日期',
+      remark: '备注',
+      createTime: '创建时间',
+      placeholderCode: '请输入托盘编码',
+      placeholderPalletType: '请输入托盘类型',
+      placeholderSpecification: '请输入托盘规格',
+      placeholderLength: '长',
+      placeholderWidth: '宽',
+      placeholderHeight: '高',
+      placeholderRatedLoadWeight: '请输入额定载重',
+      placeholderUnit: '请输入单位',
+      placeholderStatus: '请选择托盘状态',
+      placeholderWarehouseId: '请选择所属仓库',
+      placeholderAreaId: '请选择所属库区',
+      placeholderPlanCode: '请输入生产任务单号',
+      placeholderProductId: '请选择产品',
+      placeholderProductCount: '请输入产品数量',
+      placeholderPurchaseDate: '请选择采购日期',
+      placeholderUseDate: '请选择投入使用日期',
+      placeholderRemark: '请输入备注',
+      validatorCodeRequired: '托盘编码不能为空',
+      validatorPalletTypeRequired: '托盘类型不能为空',
+      validatorStatusRequired: '托盘状态不能为空'
     }
   },
   ErpPurchase: {
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 427a7797..a6bbdc0c 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -233,6 +233,8 @@ export enum DICT_TYPE {
   WAREHOUSE_RECEIVING_STATUS = 'warehouse_receiving_status', // 入库状态
   WAREHOUSE_OUTBOUND_STATUS = 'Warehouse_outbound_status', // 出库状态
   WAREHOUSE_OUTBOUND_PURPOSE = 'warehouse_outbound_purpose', // 出库用途
+  STORAGE_PALLET_TYPES = 'storage_pallet_types', // 仓储托盘类型
+  STORAGE_PALLET_STATUS = 'storage_pallet_status', // 仓储托盘状态
   SUBMOLD_TYPE = 'submold_type', // 子模具类型
   ERP_MAINTAIN_TYPE = 'maintain_type',// ERP 保养类型
 
diff --git a/src/views/erp/stock/checkExecution/components/StockCheckExecutionForm.vue b/src/views/erp/stock/checkExecution/components/StockCheckExecutionForm.vue
index 520fc6a0..2a4f8924 100644
--- a/src/views/erp/stock/checkExecution/components/StockCheckExecutionForm.vue
+++ b/src/views/erp/stock/checkExecution/components/StockCheckExecutionForm.vue
@@ -14,7 +14,8 @@
               :placeholder="t('ErpStock.Check.placeholderCheckTime')" class="!w-1/1" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" />
+        <el-col :span="12">
           <el-form-item :label="t('ErpStock.Check.sourceType')" prop="sourceType">
             <el-radio-group v-model="formData.sourceType" @change="handleSourceTypeChange">
               <el-radio :value="1">{{ t('ErpStock.Check.sourceTypeStock') }}</el-radio>
@@ -22,11 +23,25 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Check.categoryType')" prop="categoryType">
+            <el-radio-group v-model="formData.categoryType" @change="handleCategoryTypeChange">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
     <ContentWrap>
-      <el-form class="stock-check-selector-form" label-width="auto" :disabled="selectionDisabled">
+      <el-form v-if="!isInventoryCheck" class="stock-check-selector-form" label-width="auto"
+        :disabled="selectionDisabled">
         <template v-if="formData.sourceType === 1">
           <el-form-item :label="t('ErpStock.Check.warehouse')">
             <el-input :model-value="selectedWarehouseText" readonly
@@ -44,7 +59,7 @@
               </template>
             </el-input>
           </el-form-item>
-          <el-form-item v-if="selectedAreaIds.length > 0" :label="t('ErpStock.Check.checkItem')">
+          <el-form-item v-if="selectedWarehouseIds.length > 0" :label="t('ErpStock.Check.checkItem')">
             <el-input :model-value="selectedItemText" readonly :placeholder="t('ErpStock.Check.placeholderCheckItem')">
               <template #append>
                 <el-button :disabled="selectionDisabled" @click="openGeneratedItemDialog">{{ t('common.select')
@@ -73,7 +88,18 @@
         </template>
       </el-form>
 
-      <el-table :data="formData.items || []" border size="small" class="mt-12px">
+      <el-tabs v-if="isDetail" v-model="detailActiveTab" class="stock-check-detail-tabs">
+        <el-tab-pane :label="t('ErpStock.Check.list')" name="items" />
+        <el-tab-pane label="审核记录" name="approveRecords" />
+      </el-tabs>
+
+      <el-table
+        v-if="!isDetail || detailActiveTab === 'items'"
+        :data="formData.items || []"
+        border
+        size="small"
+        class="mt-12px"
+      >
         <el-table-column :label="t('ErpStock.Item.warehouse')" prop="warehouseName" min-width="120" />
         <el-table-column :label="t('ErpStock.Item.area')" prop="areaName" min-width="100" />
         <el-table-column :label="t('ErpStock.Item.barcode')" prop="productBarCode" min-width="150" />
@@ -81,8 +107,8 @@
         <el-table-column :label="t('ErpStock.Check.stockCount')" prop="stockCount" min-width="100" />
         <el-table-column v-if="isInventoryCheck" :label="t('ErpStock.Check.actualCount')" align="right" min-width="140">
           <template #default="{ row }">
-            <el-input-number v-model="row.actualCount" controls-position="right" :precision="0" :step="1"
-              step-strictly :min="0" class="!w-100%" @change="(value) => (row.actualCount = normalizeActualCount(value))" />
+            <el-input-number v-model="row.actualCount" controls-position="right" :precision="0" :min="0"
+              class="!w-100%" />
           </template>
         </el-table-column>
         <el-table-column v-if="formType === 'update'" :label="t('common.operate')" align="center" fixed="right"
@@ -94,6 +120,32 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-table v-else :data="formData.approveRecords || []" border size="small" class="mt-12px">
+        <el-table-column label="变更前状态" prop="fromStatus" align="center" min-width="110">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.fromStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="变更后状态" prop="toStatus" align="center" min-width="110">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.toStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="目标审核人" prop="targetUserName" min-width="120" />
+        <el-table-column label="操作人" prop="creatorName" min-width="120" />
+        <el-table-column
+          label="操作时间"
+          prop="createTime"
+          :formatter="dateFormatter"
+          min-width="170"
+        />
+        <el-table-column
+          :label="t('ErpStock.Check.remark')"
+          prop="remark"
+          min-width="160"
+          show-overflow-tooltip
+        />
+      </el-table>
     </ContentWrap>
     <el-form :model="formData" label-width="auto" :disabled="formDisabled" class="stock-check-bottom-form">
       <el-row :gutter="20">
@@ -107,10 +159,22 @@
     </el-form>
 
     <template #footer>
-      <el-button type="primary" :disabled="formLoading" @click="submitForm">
-        {{ t('common.save') }}
+      <el-button @click="dialogVisible = false">
+        {{ isDetail ? t('common.close') : t('common.cancel') }}
       </el-button>
-      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
+      <template v-if="!isDetail">
+        <template v-if="isInventoryCheck">
+          <el-button type="primary" :disabled="formLoading" @click="submitForm(0)">
+            {{ t('ErpStock.Check.saveDraft') }}
+          </el-button>
+          <el-button type="warning" :disabled="formLoading || hasIncompleteActualCount" @click="submitForm(1)">
+            {{ t('ErpStock.Check.inventoryCheck') }}
+          </el-button>
+        </template>
+        <el-button v-else type="primary" :disabled="formLoading" @click="submitForm()">
+          {{ t('common.save') }}
+        </el-button>
+      </template>
     </template>
   </Dialog>
 
@@ -284,7 +348,7 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { StockCheckApi, type StockCheckVO, type StockCheckItemVO } from '@/api/erp/stock/check'
 import { WarehouseApi, type WarehouseVO } from '@/api/erp/stock/warehouse'
@@ -305,30 +369,36 @@ const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref('')
 const formRef = ref()
+const detailActiveTab = ref('items')
 
+const isDetail = computed(() => formType.value === 'detail')
 const isInventoryCheck = computed(() => formType.value === 'check')
-const formDisabled = computed(() => formType.value === 'detail' || isInventoryCheck.value)
-const selectionDisabled = computed(() => formType.value === 'detail')
+const formDisabled = computed(() => isDetail.value || isInventoryCheck.value)
+const selectionDisabled = computed(() => isDetail.value)
 
 const formData = ref<FormData>({
   id: undefined,
   no: undefined,
   checkTime: undefined,
   sourceType: 1,
+  categoryType: undefined,
   remark: undefined,
   items: []
 })
 
 const formRules = reactive({
   checkTime: [{ required: true, message: t('ErpStock.Check.validatorCheckTimeRequired'), trigger: 'change' }],
-  sourceType: [{ required: true, message: t('ErpStock.Check.validatorSourceTypeRequired'), trigger: 'change' }]
+  sourceType: [{ required: true, message: t('ErpStock.Check.validatorSourceTypeRequired'), trigger: 'change' }],
+  categoryType: [{ required: true, message: t('ErpStock.Check.validatorCategoryTypeRequired'), trigger: 'change' }]
 })
 
 const getCurrentTime = () => formatDate(new Date())
-const normalizeActualCount = (value: number | string | null | undefined) => {
-  const numericValue = Number(value ?? 0)
-  return Number.isFinite(numericValue) ? Math.trunc(numericValue) : 0
-}
+const isActualCountEmpty = (value: unknown) => value === undefined || value === null || value === ''
+const hasIncompleteActualCount = computed(() =>
+  (formData.value.items || []).some((item) => isActualCountEmpty(item.actualCount))
+)
+const getCheckItemName = (item: StockCheckItemVO) =>
+  item.productBarCode || item.productName || `${t('ErpStock.Check.checkItem')}${item.id ? `-${item.id}` : ''}`
 
 const selectedWarehouses = ref<WarehouseVO[]>([])
 const selectedAreas = ref<WarehouseAreaVO[]>([])
@@ -396,6 +466,8 @@ const generatedItemTableRef = ref()
 const generatedItemList = ref<StockCheckItemVO[]>([])
 const generatedItemSelection = ref<StockCheckItemVO[]>([])
 
+const getDefaultCategoryType = () => getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)[0]?.value
+
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = type === 'check' ? t('ErpStock.Check.inventoryCheck') : t('action.' + type)
@@ -411,8 +483,10 @@ const open = async (type: string, id?: number) => {
     formData.value = {
       ...data,
       sourceType: Number(data?.sourceType ?? 1),
+      categoryType: data?.categoryType ?? getDefaultCategoryType(),
       checkTime: data?.checkTime ? formatDate(data.checkTime as Date) : undefined,
-      items: data?.items || []
+      items: data?.items || [],
+      approveRecords: data?.approveRecords || []
     }
     if (type === 'detail') {
       await enrichItemsForDisplay()
@@ -435,6 +509,10 @@ const handleSourceTypeChange = () => {
   clearSelections()
 }
 
+const handleCategoryTypeChange = () => {
+  clearSelections()
+}
+
 const clearSelections = () => {
   selectedWarehouses.value = []
   selectedAreas.value = []
@@ -533,7 +611,10 @@ const syncTableSelection = async (tableRef, rows: any[], selectedIds: number[])
 const getWarehouseList = async () => {
   warehouseLoading.value = true
   try {
-    const data = await WarehouseApi.getWarehousePage(warehouseQueryParams)
+    const data = await WarehouseApi.getWarehousePage({
+      ...warehouseQueryParams,
+      categoryType: formData.value.categoryType
+    })
     warehouseList.value = data?.list || []
     warehouseTotal.value = data?.total || 0
     await syncTableSelection(warehouseTableRef, warehouseList.value, selectedWarehouseIds.value)
@@ -565,7 +646,6 @@ const confirmWarehouseSelection = () => {
   warehouseDialogVisible.value = false
   if (!sameIds(oldIds, selectedWarehouseIds.value)) {
     selectedAreas.value = []
-    formData.value.items = []
   }
 }
 
@@ -613,12 +693,8 @@ const resetAreaQuery = () => {
 }
 
 const confirmAreaSelection = () => {
-  const oldIds = selectedAreaIds.value
   selectedAreas.value = [...areaSelection.value]
   areaDialogVisible.value = false
-  if (!sameIds(oldIds, selectedAreaIds.value)) {
-    formData.value.items = []
-  }
 }
 
 const handleAreaRowClick = (row: WarehouseAreaVO) => {
@@ -628,7 +704,10 @@ const handleAreaRowClick = (row: WarehouseAreaVO) => {
 const getProductList = async () => {
   productLoading.value = true
   try {
-    const data = await ProductApi.getProductPage(productQueryParams)
+    const data = await ProductApi.getProductPage({
+      ...productQueryParams,
+      categoryType: formData.value.categoryType
+    })
     productList.value = data?.list || []
     productTotal.value = data?.total || 0
     await syncTableSelection(productTableRef, productList.value, selectedProductIds.value)
@@ -656,12 +735,8 @@ const resetProductQuery = () => {
 }
 
 const confirmProductSelection = () => {
-  const oldIds = selectedProductIds.value
   selectedProducts.value = [...productSelection.value]
   productDialogVisible.value = false
-  if (!sameIds(oldIds, selectedProductIds.value)) {
-    formData.value.items = []
-  }
 }
 
 const handleProductRowClick = (row: ProductVO) => {
@@ -676,8 +751,8 @@ const normalizeGeneratedItems = (data: any) => {
 }
 
 const openGeneratedItemDialog = async () => {
-  if (formData.value.sourceType === 1 && selectedAreaIds.value.length === 0) {
-    message.warning(t('ErpStock.Check.validatorSelectAreaFirst'))
+  if (formData.value.sourceType === 1 && selectedWarehouseIds.value.length === 0) {
+    message.warning(t('ErpStock.Check.validatorSelectWarehouseFirst'))
     return
   }
   if (formData.value.sourceType === 2 && selectedProductIds.value.length === 0) {
@@ -691,11 +766,13 @@ const openGeneratedItemDialog = async () => {
       formData.value.sourceType === 1
         ? await StockCheckApi.generateItemsByLocation({
           warehouseIds: selectedWarehouseIds.value,
-          areaIds: selectedAreaIds.value,
+          ...(selectedAreaIds.value.length > 0 ? { areaIds: selectedAreaIds.value } : {}),
+          categoryType: formData.value.categoryType,
           allowEmpty: true
         })
         : await StockCheckApi.generateItemsByProduct({
           productIds: selectedProductIds.value,
+          categoryType: formData.value.categoryType,
           allowEmpty: true
         })
     generatedItemList.value = normalizeGeneratedItems(data)
@@ -727,7 +804,7 @@ const handleGeneratedItemRowClick = (row: StockCheckItemVO) => {
 const confirmGeneratedItemSelection = () => {
   formData.value.items = generatedItemSelection.value.map((item) => ({
     ...item,
-    actualCount: normalizeActualCount(item.actualCount ?? item.stockCount),
+    actualCount: item.actualCount ?? item.stockCount ?? 0,
     count: item.count ?? 0
   }))
   generatedItemDialogVisible.value = false
@@ -754,7 +831,7 @@ const getSubmitData = () => {
       remark: item.remark
     } as Record<string, unknown>
     if (formType.value !== 'create') {
-      submitItem.actualCount = normalizeActualCount(item.actualCount)
+      submitItem.actualCount = item.actualCount
     }
     return submitItem
   })
@@ -763,21 +840,37 @@ const getSubmitData = () => {
     id: formData.value.id,
     checkTime: formData.value.checkTime,
     sourceType: formData.value.sourceType,
+    categoryType: formData.value.categoryType,
+    checkStatus: isInventoryCheck.value ? formData.value.checkStatus : undefined,
     remark: formData.value.remark,
     items
   } as StockCheckVO
 }
 
-const submitForm = async () => {
+const submitForm = async (checkStatus?: 0 | 1) => {
   await formRef.value.validate()
   if (!formData.value.items?.length) {
     message.warning(t('ErpStock.Check.validatorSelectCheckItem'))
     return
   }
+  if (checkStatus === 1 && hasIncompleteActualCount.value) {
+    message.warning(t('ErpStock.Check.validatorCompleteCheckInfo'))
+    return
+  }
+  if (checkStatus === 1) {
+    const zeroCountItems = (formData.value.items || []).filter((item) => Number(item.actualCount) === 0)
+    if (zeroCountItems.length > 0) {
+      const itemNames = zeroCountItems.map((item) => getCheckItemName(item)).join('、')
+      await message.confirm(`${itemNames}${t('ErpStock.Check.confirmActualCountZero')}`)
+    }
+  }
   if (isInventoryCheck.value) {
+    formData.value.checkStatus = checkStatus
     formData.value.items.forEach((item) => {
-      const actualCount = normalizeActualCount(item.actualCount)
-      item.actualCount = actualCount
+      if (isActualCountEmpty(item.actualCount)) {
+        return
+      }
+      const actualCount = Number(item.actualCount ?? 0)
       const stockCount = Number(item.stockCount ?? 0)
       item.count = actualCount - stockCount
     })
@@ -801,16 +894,19 @@ const submitForm = async () => {
 }
 
 const resetForm = () => {
+  formRef.value?.resetFields()
   formData.value = {
     id: undefined,
     no: undefined,
     checkTime: getCurrentTime(),
     sourceType: 1,
+    categoryType: getDefaultCategoryType(),
     remark: undefined,
-    items: []
+    items: [],
+    approveRecords: []
   }
+  detailActiveTab.value = 'items'
   clearSelections()
-  formRef.value?.resetFields()
 }
 </script>
 
@@ -839,6 +935,10 @@ const resetForm = () => {
   margin-bottom: 0;
 }
 
+.stock-check-detail-tabs {
+  margin-top: 12px;
+}
+
 .stock-check-dialog-pagination {
   padding-top: 12px;
   padding-bottom: 56px;
diff --git a/src/views/erp/stock/checkExecution/index.vue b/src/views/erp/stock/checkExecution/index.vue
index fde8217c..97ca0a30 100644
--- a/src/views/erp/stock/checkExecution/index.vue
+++ b/src/views/erp/stock/checkExecution/index.vue
@@ -97,70 +97,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="45" />
-      <el-table-column type="expand">
-        <template #default="{ row }">
-          <div class="stock-check-execution-expand">
-            <div class="stock-check-execution-expand__section">
-              <div class="stock-check-execution-expand__title">{{ t('ErpStock.Check.list') }}</div>
-              <el-table :data="row.items || []" size="small" border>
-                <el-table-column
-                  :label="t('ErpStock.Item.warehouse')"
-                  prop="warehouseName"
-                  min-width="120"
-                />
-                <el-table-column :label="t('ErpStock.Item.area')" prop="areaName" min-width="100" />
-                <el-table-column
-                  :label="t('ErpStock.Item.barcode')"
-                  prop="productBarCode"
-                  min-width="150"
-                />
-                <el-table-column
-                  :label="t('ErpStock.Item.product')"
-                  prop="productName"
-                  min-width="160"
-                />
-                <el-table-column
-                  :label="t('ErpStock.Check.stockCount')"
-                  prop="stockCount"
-                  align="right"
-                  min-width="100"
-                />
-              </el-table>
-            </div>
-
-            <div class="stock-check-execution-expand__section">
-              <div class="stock-check-execution-expand__title">审核记录</div>
-              <el-table :data="row.approveRecords || []" size="small" border>
-                <el-table-column label="操作类型" prop="actionType" min-width="110" />
-                <el-table-column label="变更前状态" prop="fromStatus" align="center" min-width="110">
-                  <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.fromStatus" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="变更后状态" prop="toStatus" align="center" min-width="110">
-                  <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.toStatus" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="目标审核人" prop="targetUserName" min-width="120" />
-                <el-table-column label="操作人" prop="creatorName" min-width="120" />
-                <el-table-column
-                  label="操作时间"
-                  prop="createTime"
-                  :formatter="dateFormatter"
-                  min-width="170"
-                />
-                <el-table-column
-                  :label="t('ErpStock.Check.remark')"
-                  prop="remark"
-                  min-width="160"
-                  show-overflow-tooltip
-                />
-              </el-table>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column :label="t('ErpStock.Check.no')" prop="no" align="center" min-width="150" />
       <el-table-column
         :label="t('ErpStock.Check.productNames')"
@@ -184,7 +120,17 @@
           <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="审核人" prop="auditUserName" align="center" min-width="120" />
+      <el-table-column :label="t('ErpStock.Check.checkStatus')" prop="checkStatus" align="center" min-width="100">
+        <template #default="scope">
+          <el-tag :type="Number(scope.row.checkStatus) === 1 ? 'success' : 'info'">
+            {{
+              Number(scope.row.checkStatus) === 1
+                ? t('ErpStock.Check.checkStatusChecked')
+                : t('ErpStock.Check.checkStatusUnchecked')
+            }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         :label="t('ErpStock.Check.creator')"
         prop="creatorName"
@@ -197,19 +143,35 @@
         :formatter="dateFormatter"
         min-width="170"
       />
+      <el-table-column :label="t('ErpStock.Check.auditUserName')" prop="auditUserName" align="center" min-width="120" />
       <el-table-column
         :label="t('ErpStock.Check.remark')"
         prop="remark"
         min-width="160"
         show-overflow-tooltip
       />
-      <el-table-column :label="t('common.operate')" align="center" fixed="right" width="200">
+      <el-table-column :label="t('common.operate')" align="center" fixed="right" width="320">
         <template #default="scope">
+          <el-button
+            v-if="Number(scope.row.status) === 10"
+            link
+            type="primary"
+            @click="openAuditDialog(scope.row, 20)"
+          >
+            {{ t('ErpStock.Check.auditApprove') }}
+          </el-button>
+          <el-button
+            v-if="Number(scope.row.status) === 10"
+            link
+            type="danger"
+            @click="openAuditDialog(scope.row, 1)"
+          >
+            {{ t('ErpStock.Check.auditReject') }}
+          </el-button>
           <el-button
             link
             type="primary"
             @click="openForm('detail', scope.row.id)"
-            v-hasPermi="['erp:stock-check:query']"
           >
             {{ t('action.detail') }}
           </el-button>
@@ -222,8 +184,17 @@
             {{ t('action.edit') }}
           </el-button>
           <el-button
+            v-if="[0, 1].includes(Number(scope.row.status)) && Number(scope.row.checkStatus) === 1"
             link
             type="primary"
+            @click="openSubmitDialog(scope.row)"
+          >
+            {{ t('ErpStock.Check.submit') }}
+          </el-button>
+          <el-button
+            v-if="Number(scope.row.checkStatus) !== 1"
+            link
+            type="warning"
             :disabled="scope.row.status === 20"
             @click="openForm('check', scope.row.id)"
           >
@@ -249,6 +220,59 @@
     />
   </ContentWrap>
 
+  <Dialog :title="submitActionText" v-model="submitDialogVisible" width="500">
+    <el-form ref="submitFormRef" :model="submitForm" :rules="submitRules" label-width="auto">
+      <el-form-item v-if="!isAuditDisabled" :label="t('ErpStock.Check.auditUserName')" prop="auditUserId">
+        <el-select
+          v-model="submitForm.auditUserId"
+          filterable
+          :placeholder="t('ErpStock.Check.placeholderAuditUser')"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Check.submitRemark')" prop="remark">
+        <el-input
+          v-model="submitForm.remark"
+          type="textarea"
+          :rows="3"
+          :placeholder="t('ErpStock.Check.placeholderSubmitRemark')"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :disabled="submitLoading" @click="handleSubmit">
+        {{ t('common.ok') }}
+      </el-button>
+      <el-button @click="submitDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+
+  <Dialog :title="auditDialogTitle" v-model="auditDialogVisible" width="500">
+    <el-form :model="auditForm" label-width="auto">
+      <el-form-item :label="t('ErpStock.Check.auditRemark')" prop="remark">
+        <el-input
+          v-model="auditForm.remark"
+          type="textarea"
+          :rows="3"
+          :placeholder="t('ErpStock.Check.placeholderAuditRemark')"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :disabled="auditLoading" @click="handleAudit">
+        {{ t('common.ok') }}
+      </el-button>
+      <el-button @click="auditDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+
   <StockCheckExecutionForm ref="formRef" @success="getList" />
 </template>
 
@@ -257,6 +281,8 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import { StockCheckApi, type StockCheckVO } from '@/api/erp/stock/check'
 import { WarehouseApi, type WarehouseVO } from '@/api/erp/stock/warehouse'
+import * as UserApi from '@/api/system/user'
+import * as ConfigApi from '@/api/infra/config'
 import StockCheckExecutionForm from './components/StockCheckExecutionForm.vue'
 
 defineOptions({ name: 'ErpStockCheckExecution' })
@@ -269,8 +295,34 @@ const list = ref<StockCheckVO[]>([])
 const total = ref(0)
 const warehouseList = ref<WarehouseVO[]>([])
 const selectionList = ref<StockCheckVO[]>([])
+const userList = ref<UserApi.UserVO[]>([])
 const queryFormRef = ref()
 const formRef = ref()
+const submitFormRef = ref()
+const submitDialogVisible = ref(false)
+const submitLoading = ref(false)
+const submitForm = reactive({
+  id: undefined as number | undefined,
+  auditUserId: undefined as number | undefined,
+  remark: undefined as string | undefined
+})
+const isAuditDisabled = ref(false)
+const submitActionText = computed(() =>
+  isAuditDisabled.value ? t('ErpStock.Check.inventoryCheck') : t('ErpStock.Check.submit')
+)
+const submitRules = computed(() => isAuditDisabled.value ? {} : {
+  auditUserId: [{ required: true, message: t('ErpStock.Check.validatorAuditUserRequired'), trigger: 'change' }]
+})
+const auditDialogVisible = ref(false)
+const auditLoading = ref(false)
+const auditForm = reactive({
+  id: undefined as number | undefined,
+  status: undefined as number | undefined,
+  remark: undefined as string | undefined
+})
+const auditDialogTitle = computed(() =>
+  auditForm.status === 20 ? t('ErpStock.Check.auditApprove') : t('ErpStock.Check.auditReject')
+)
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -291,6 +343,16 @@ const getList = async () => {
   }
 }
 
+const loadAuditConfig = async () => {
+  try {
+    const data = await ConfigApi.getConfigPage({ pageNo: 1, pageSize: 10, key: 'inventoryAudit' } as PageParam & { key: string })
+    const auditConfig = data?.list?.find((item) => item?.key === 'inventoryAudit')
+    isAuditDisabled.value = auditConfig?.value === '0'
+  } catch {
+    isAuditDisabled.value = false
+  }
+}
+
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
@@ -322,35 +384,98 @@ const handleSelectionChange = (rows: StockCheckVO[]) => {
   selectionList.value = rows
 }
 
+const openSubmitDialog = (row: StockCheckVO) => {
+  const hasIncompleteItem = (row.items || []).some(
+    (item) => item.actualCount === undefined || item.actualCount === null || item.actualCount === ''
+  )
+  if (hasIncompleteItem) {
+    message.warning(t('ErpStock.Check.validatorCompleteCheckInfo'))
+    return
+  }
+  submitForm.id = row.id
+  submitForm.auditUserId = row.auditUserId
+  submitForm.remark = undefined
+  submitDialogVisible.value = true
+  submitFormRef.value?.clearValidate()
+}
+
+const handleSubmit = async () => {
+  if (!isAuditDisabled.value) {
+    await submitFormRef.value.validate()
+  }
+  if (!submitForm.id || (!isAuditDisabled.value && !submitForm.auditUserId)) {
+    return
+  }
+  submitLoading.value = true
+  try {
+    if (isAuditDisabled.value) {
+      await StockCheckApi.auditStockCheck({
+        id: submitForm.id,
+        status: 20,
+        remark: submitForm.remark
+      })
+      message.success(t('ErpStock.Check.auditApproveSuccess'))
+      submitDialogVisible.value = false
+      await getList()
+      return
+    }
+    const data: { id: number; auditUserId?: number; remark?: string } = {
+      id: submitForm.id,
+      remark: submitForm.remark
+    }
+    data.auditUserId = submitForm.auditUserId
+    await StockCheckApi.submitStockCheck(data)
+    message.success(t('ErpStock.Check.submitSuccess'))
+    submitDialogVisible.value = false
+    await getList()
+  } finally {
+    submitLoading.value = false
+  }
+}
+
+const openAuditDialog = (row: StockCheckVO, status: number) => {
+  auditForm.id = row.id
+  auditForm.status = status
+  auditForm.remark = undefined
+  auditDialogVisible.value = true
+}
+
+const handleAudit = async () => {
+  if (!auditForm.id || !auditForm.status) {
+    return
+  }
+  auditLoading.value = true
+  try {
+    await StockCheckApi.auditStockCheck({
+      id: auditForm.id,
+      status: auditForm.status,
+      remark: auditForm.remark
+    })
+    message.success(
+      auditForm.status === 20
+        ? t('ErpStock.Check.auditApproveSuccess')
+        : t('ErpStock.Check.auditRejectSuccess')
+    )
+    auditDialogVisible.value = false
+    await getList()
+  } finally {
+    auditLoading.value = false
+  }
+}
+
 const getWarehouseNames = (row: StockCheckVO) => {
   const names = Array.from(new Set((row.items || []).map((item) => item.warehouseName).filter(Boolean)))
   return names.length ? names.join('、') : '-'
 }
 
 onMounted(async () => {
-  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  const [warehouses, users] = await Promise.all([
+    WarehouseApi.getWarehouseSimpleList(),
+    UserApi.getSimpleUserList(),
+    loadAuditConfig()
+  ])
+  warehouseList.value = warehouses || []
+  userList.value = users || []
   await getList()
 })
 </script>
-
-<style scoped>
-.stock-check-execution-expand {
-  display: grid;
-  gap: 14px;
-  padding: 12px 24px 16px;
-  background: var(--el-fill-color-lighter);
-}
-
-.stock-check-execution-expand__section {
-  padding: 12px;
-  border: 1px solid var(--el-border-color-lighter);
-  border-radius: 6px;
-  background: #fff;
-}
-
-.stock-check-execution-expand__title {
-  margin-bottom: 10px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-</style>
diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 812609a5..778f1780 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -285,7 +285,10 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as StockInVO
+    const data = {
+      ...formData.value,
+      items: normalizeItemsForSubmit(formData.value.items)
+    } as unknown as StockInVO
     if (formType.value === 'create') {
       await StockInApi.createStockIn(data)
       message.success(t('common.createSuccess'))
@@ -300,6 +303,19 @@ const submitForm = async () => {
   }
 }
 
+const normalizeItemsForSubmit = (items: any[] = []) => {
+  return items.map((item) => {
+    const { relatedTask, palletId, palletCode, taskCode, taskName, productCode, productUnitName, stockCount, totalPrice, ...rest } = item
+    const relateTask = item.relateTask === true || item.relateTask === 1 || item.relateTask === '1'
+    return {
+      ...rest,
+      relateTask,
+      taskId: relateTask ? item.taskId : null,
+      pallets: Array.isArray(item.pallets) ? item.pallets : []
+    }
+  })
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index b2574a5e..4b27c228 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="0px"
     :inline-message="true" :disabled="disabled">
-    <el-table :data="formData" size="small" show-summary :summary-method="getSummaries" class="-mt-10px">
+    <el-table :data="formData" size="small" class="-mt-10px">
       <el-table-column :label="t('common.index')" type="index" align="center" width="60" />
       <el-table-column :label="t('ErpStock.Item.warehouse')" min-width="125">
         <template #default="{ row, $index }">
@@ -30,14 +30,34 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column :label="t('ErpStock.Item.barcode')" min-width="160">
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.relatedTask')" min-width="120">
+        <template #default="{ row }">
+          <el-select v-model="row.relateTask" :placeholder="t('common.selectText')" @change="handleRelatedTaskChange(row)">
+            <el-option :label="t('common.yes')" :value="true" />
+            <el-option :label="t('common.no')" :value="false" />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column :label="isProductStockIn ? selectorColumnLabel : t('ErpStock.Item.barcode')" min-width="190">
         <!--        <template #default="{ row }">
                   <el-form-item class="mb-0px!">
                     <el-input disabled v-model="row.productBarCode" />
                   </el-form-item>
-                </template>-->
+        </template>-->
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.productBarCode`" class="mb-0px!">
+          <div v-if="isProductStockIn && isRowRelatedTask(row)" class="task-product-select">
+            <el-form-item :prop="`${$index}.taskId`" :rules="formRules.taskId" class="mb-0px!">
+              <el-input
+                :model-value="formatTaskSelection(row)"
+                readonly
+                clearable
+                :placeholder="t('ErpStock.Item.placeholderTaskOrder')"
+                @click="openTaskSelectDialog(row)"
+                @clear="clearTask(row)"
+              />
+            </el-form-item>
+          </div>
+          <el-form-item v-else :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <div class="product-code-select">
               <el-input v-model="row.productBarCode" readonly clearable
                 :placeholder="t('ErpStock.Item.placeholderBarcode')" @click="openProductSelectDialog(row)"
@@ -46,31 +66,37 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column :label="t('ErpStock.Item.product')" min-width="180">
-        <template #default="{ row, $index }">
-          <el-form-item v-if="isProductMaterialStockIn" :prop="`${$index}.productId`" :rules="formRules.productId"
-            class="mb-0px!">
-            <el-input v-model="row.productName" disabled :placeholder="t('ErpStock.Item.placeholderProduct')" />
-          </el-form-item>
-          <el-form-item v-else :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
-            <el-cascader v-model="row.productId" :options="productCascaderOptions" :props="productCascaderProps"
-              :show-all-levels="false" clearable filterable @change="onChangeProduct($event, row)"
-              :placeholder="t('ErpStock.Item.placeholderProduct')" class="!w-100%" />
-          </el-form-item>
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.productName')" min-width="150">
+        <template #default="{ row }">
+          <el-input :model-value="row.productName || '-'" readonly />
         </template>
       </el-table-column>
-      <el-table-column :label="t('ErpStock.Item.stock')" min-width="100">
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.packagingScheme')" min-width="150">
         <template #default="{ row }">
-          <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
-          </el-form-item>
+          <el-input :model-value="row.packagingSchemeName || '-'" readonly />
         </template>
       </el-table-column>
-
-      <el-table-column :label="t('ErpStock.Item.inventoryUnit')" min-width="80">
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.PackagingScheme.palletPackageQuantity')" min-width="120">
         <template #default="{ row }">
-          <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.productUnitName" />
+          <el-input :model-value="row.palletPackageQuantity ?? '-'" readonly />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.packageItemCount')" min-width="120">
+        <template #default="{ row }">
+          <el-input :model-value="row.packageQuantity ?? '-'" readonly />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.palletCode')" min-width="180">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.pallets`" :rules="formRules.pallets" class="mb-0px!">
+            <el-input
+              v-model="row.palletCode"
+              readonly
+              clearable
+              :placeholder="t('ErpStock.Item.placeholderPalletCode')"
+              @click="openPalletSelectDialog(row)"
+              @clear="clearPallet(row)"
+            />
           </el-form-item>
         </template>
       </el-table-column>
@@ -88,43 +114,11 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column v-if="isPurchaseUnitStockIn" min-width="120">
-        <template #header>
-          {{ t('ErpStock.Item.purchaseUnitConvertQuantity') }}
-          <el-tooltip effect="dark" placement="top">
-            <template #content>
-              {{ purchaseUnitConvertTipText }}
-            </template>
-            <Icon icon="ep:question-filled" class="ml-4px" style="vertical-align: middle; color: #909399; cursor: pointer;" />
-          </el-tooltip>
-        </template>
-        <template #default="{ row }">
-          <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.purchaseUnitConvertQuantity" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.inputUnitType')" min-width="120">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.inputUnitType`" class="mb-0px!">
-            <el-select v-model="row.inputUnitType" clearable :placeholder="t('common.selectText')">
-              <el-option v-for="item in inputUnitTypeOptions" :key="item" :label="item" :value="item" />
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="isProductMaterialStockIn" :label="t('ErpStock.Item.inputCount')" prop="inputCount" min-width="140">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.inputCount`" class="mb-0px!">
-            <el-input-number v-model="row.inputCount" controls-position="right" :min="0.001" :precision="3"
-              class="!w-100%" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('ErpStock.Item.count')" prop="count" fixed="right" min-width="140">
+      <el-table-column :label="t('ErpStock.Item.count')" prop="count" min-width="140">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.count`" :rules="formRules.count" class="mb-0px!">
-            <el-input disabled v-model="row.count" :formatter="erpCountInputFormatter" />
+            <el-input v-if="isProductStockIn" :model-value="row.count ?? '-'" readonly />
+            <el-input-number v-else v-model="row.count" controls-position="right" :min="0.001" :precision="3" class="!w-100%" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -168,7 +162,7 @@
     <el-button @click="handleAdd" round>+ {{ t('ErpStock.In.addItem') }}</el-button>
   </el-row>
 
-  <Dialog :title="t('ErpStock.Item.selectCode')" v-model="productDialogVisible" width="900px">
+  <Dialog :title="t('ErpStock.Item.selectProduct')" v-model="productDialogVisible" width="900px">
     <el-form :model="productQueryParams" :inline="true" class="-mb-15px">
       <el-form-item :label="t('ErpStock.Item.code')">
         <el-input v-model="productQueryParams.barCode" clearable :placeholder="t('ErpStock.Item.placeholderCode')"
@@ -213,6 +207,201 @@
       <el-button @click="productDialogVisible = false">{{ t('common.cancel') }}</el-button>
     </template>
   </Dialog>
+
+  <Dialog :title="t('ErpStock.Item.selectTaskOrder')" v-model="taskDialogVisible" width="1100px">
+    <div class="task-select-dialog">
+      <div class="task-select-dialog__section-title">{{ t('ErpStock.Item.selectTaskOrder') }}</div>
+    <el-form :model="taskQueryParams" :inline="true" class="-mb-15px">
+      <el-form-item :label="t('ProductionPlan.Task.searchCodeLabel')">
+        <el-input
+          v-model="taskQueryParams.code"
+          clearable
+          :placeholder="t('ProductionPlan.Task.searchCodePlaceholder')"
+          @keyup.enter="handleTaskDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleTaskDialogQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      v-loading="taskDialogLoading"
+      :data="taskDialogList"
+      row-key="id"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @row-click="handleTaskDialogRowClick"
+    >
+      <el-table-column width="55" align="center">
+        <template #default="{ row }">
+          <el-radio v-model="selectedTaskId" :label="row.id">&nbsp;</el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ProductionPlan.Task.tableCodeColumn')" prop="code" min-width="160" />
+      <el-table-column :label="t('ProductionPlan.Task.tableOrderDateColumn')" prop="orderDate" :formatter="dateFormatter2" min-width="120" />
+      <el-table-column :label="t('ProductionPlan.Task.tableDeliveryDateColumn')" prop="deliveryDate" :formatter="dateFormatter2" min-width="120" />
+      <el-table-column :label="t('ProductionPlan.Task.tableStatusColumn')" prop="status" min-width="100">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ProductionPlan.Task.tableRemarkColumn')" prop="remark" min-width="160" />
+    </el-table>
+    <div class="product-dialog-pagination">
+      <Pagination
+        :total="taskDialogTotal"
+        v-model:page="taskQueryParams.pageNo"
+        v-model:limit="taskQueryParams.pageSize"
+        @pagination="getTaskDialogList"
+      />
+    </div>
+      <div class="task-select-dialog__section-title mt-12px">{{ t('ErpStock.Item.selectProduct') }}</div>
+      <el-table
+        v-loading="taskSchemeLoading"
+        :data="taskProductDialogList"
+        row-key="productId"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        empty-text="请先选择任务单"
+        @row-click="handleTaskProductDialogRowClick"
+      >
+        <el-table-column width="55" align="center">
+          <template #default="{ row }">
+            <el-radio v-model="selectedTaskProductId" :label="row.productId">&nbsp;</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('ErpStock.Item.code')" prop="productCode" min-width="180" />
+        <el-table-column :label="t('ErpStock.Item.productName')" prop="productName" min-width="160" />
+        <el-table-column :label="t('ErpStock.Item.packagingScheme')" min-width="160">
+          <template #default="{ row }">
+            {{ getDefaultTaskProductScheme(row)?.packagingSchemeName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('ErpStock.PackagingScheme.palletPackageQuantity')" min-width="120">
+          <template #default="{ row }">
+            {{ getDefaultTaskProductScheme(row)?.palletPackageQuantity ?? '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('ErpStock.Item.packageItemCount')" min-width="120">
+          <template #default="{ row }">
+            {{ getDefaultTaskProductScheme(row)?.packageQuantity ?? '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <template #footer>
+      <el-button type="primary" :loading="taskSchemeLoading" :disabled="!selectedTaskId || !selectedTaskProductId" @click="confirmTaskSelect">{{ t('common.ok') }}</el-button>
+      <el-button @click="taskDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+
+  <Dialog :title="t('ErpStock.Item.selectPalletCode')" v-model="palletDialogVisible" width="1280px">
+    <el-form :model="palletQueryParams" :inline="true" class="-mb-15px">
+      <el-form-item :label="t('ErpStock.Pallet.code')">
+        <el-input
+          v-model="palletQueryParams.code"
+          clearable
+          :placeholder="t('ErpStock.Pallet.placeholderCode')"
+          @keyup.enter="handlePalletDialogQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.status')">
+        <el-select v-model="palletQueryParams.status" clearable :placeholder="t('ErpStock.Pallet.placeholderStatus')" class="!w-180px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.STORAGE_PALLET_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handlePalletDialogQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <div class="pallet-transfer">
+      <div class="pallet-transfer__panel">
+        <div class="pallet-transfer__title">{{ t('ErpStock.Item.availablePallets') }}</div>
+        <el-table
+          ref="availablePalletTableRef"
+          v-loading="palletDialogLoading"
+          :data="availablePalletList"
+          row-key="id"
+          height="340"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          @selection-change="handleAvailablePalletSelectionChange"
+          @row-click="toggleAvailablePallet"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column :label="t('ErpStock.Pallet.code')" prop="code" min-width="150" />
+          <el-table-column :label="t('ErpStock.Pallet.palletType')" prop="palletType" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :type="DICT_TYPE.STORAGE_PALLET_TYPES" :value="row.palletType" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('ErpStock.Pallet.status')" prop="status" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :type="DICT_TYPE.STORAGE_PALLET_STATUS" :value="row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('ErpStock.Pallet.planCode')" prop="planCode" min-width="150" />
+        </el-table>
+        <div class="product-dialog-pagination">
+          <Pagination
+            :total="palletDialogTotal"
+            v-model:page="palletQueryParams.pageNo"
+            v-model:limit="palletQueryParams.pageSize"
+            @pagination="getPalletDialogList"
+          />
+        </div>
+      </div>
+      <div class="pallet-transfer__actions">
+        <el-button type="primary" :disabled="availablePalletSelection.length === 0" @click="addSelectedPallets">
+          <Icon icon="ep:arrow-right" />
+        </el-button>
+        <el-button :disabled="rightPalletSelection.length === 0" @click="removeSelectedPallets">
+          <Icon icon="ep:arrow-left" />
+        </el-button>
+      </div>
+      <div class="pallet-transfer__panel">
+        <div class="pallet-transfer__title">{{ t('ErpStock.Item.selectedPallets') }}</div>
+        <el-table
+          ref="rightPalletTableRef"
+          :data="selectedPalletRows"
+          row-key="id"
+          height="340"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          @selection-change="handleRightPalletSelectionChange"
+          @row-click="toggleRightPallet"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column :label="t('ErpStock.Pallet.code')" prop="code" min-width="150" />
+          <el-table-column :label="t('ErpStock.Item.packageCount')" min-width="130">
+            <template #default="{ row }">
+              <el-input-number
+                v-model="row.packageCount"
+                controls-position="right"
+                :min="0"
+                :precision="3"
+                class="!w-100%"
+                @click.stop
+              />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('ErpStock.Item.itemCount')" min-width="130">
+            <template #default="{ row }">
+              <el-input :model-value="getSelectedPalletItemCount(row)" readonly />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="confirmPalletSelect">{{ t('common.ok') }}</el-button>
+      <el-button @click="palletDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
 </template>
 <script setup lang="ts">
 import { Icon } from '@/components/Icon'
@@ -220,12 +409,11 @@ import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
 import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/erp/stock/warehousearea'
 import { StockApi } from '@/api/erp/stock/stock'
-import {
-  erpCountInputFormatter,
-  erpPriceInputFormatter,
-  erpPriceMultiply,
-  getSumValue
-} from '@/utils'
+import { TaskApi, TaskVO } from '@/api/mes/task'
+import { PalletApi, PalletVO } from '@/api/erp/stock/pallet'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter2 } from '@/utils/formatTime'
+import { erpPriceMultiply } from '@/utils'
 
 const props = defineProps<{
   items: any[] | undefined
@@ -239,6 +427,8 @@ const formRules = reactive({
   warehouseId: [{ required: true, message: t('ErpStock.Item.validatorWarehouseRequired'), trigger: 'blur' }],
   areaId: [{ required: true, message: t('ErpStock.Item.placeholderArea'), trigger: 'change' }],
   productId: [{ required: true, message: t('ErpStock.Item.validatorProductRequired'), trigger: 'blur' }],
+  taskId: [{ required: true, message: t('ErpStock.Item.validatorTaskRequired'), trigger: 'change' }],
+  pallets: [{ validator: validatePallets, trigger: 'change' }],
   count: [{ required: true, message: t('ErpStock.Item.validatorCountRequired'), trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref
@@ -246,7 +436,6 @@ const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const defaultWarehouse = ref<WarehouseVO>(undefined) // 默认仓库
 const warehouseAreaMap = ref<Record<number, WarehouseAreaVO[]>>({})
-const inputUnitTypeOptions = ['个', '包', '托']
 const stockInCategoryTypeMap: Record<string, number> = {
   产品入库: 1,
   物料入库: 2,
@@ -256,7 +445,12 @@ const activeCategoryType = computed(() => stockInCategoryTypeMap[props.inType ||
 const isProductMaterialStockIn = computed(() => Boolean(activeCategoryType.value))
 const isProductStockIn = computed(() => activeCategoryType.value === 1)
 const isPurchaseUnitStockIn = computed(() => activeCategoryType.value === 2 || activeCategoryType.value === 3)
-const purchaseUnitConvertTipText = computed(() => t('FactoryModeling.ProductInformation.dialogPurchaseUnitConvertTip'))
+const selectorColumnLabel = computed(() => {
+  const rows = formData.value || []
+  return rows.length > 0 && rows.every((row) => isRowRelatedTask(row))
+    ? `${t('ErpStock.Item.taskOrder')}/${t('ErpStock.Item.selectProduct')}`
+    : t('ErpStock.Item.selectProduct')
+})
 const productDialogVisible = ref(false)
 const productDialogLoading = ref(false)
 const productDialogList = ref<any[]>([])
@@ -270,36 +464,48 @@ const productQueryParams = reactive({
 })
 const currentSelectRow = ref<any>()
 const selectedProductId = ref<number>()
+const taskDialogVisible = ref(false)
+const taskDialogLoading = ref(false)
+const taskSchemeLoading = ref(false)
+const taskDialogList = ref<TaskVO[]>([])
+const taskDialogTotal = ref(0)
+const taskQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined
+})
+const selectedTaskId = ref<number>()
+const selectedTaskProductId = ref<number>()
+const taskProductDialogList = ref<any[]>([])
+const selectedTaskData = ref<any>()
+const palletDialogVisible = ref(false)
+const palletDialogLoading = ref(false)
+const palletDialogList = ref<PalletVO[]>([])
+const palletDialogTotal = ref(0)
+const palletQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  status: undefined
+})
+const availablePalletSelection = ref<PalletVO[]>([])
+const rightPalletSelection = ref<any[]>([])
+const selectedPalletRows = ref<any[]>([])
+const availablePalletTableRef = ref()
+const rightPalletTableRef = ref()
+const availablePalletList = computed(() => {
+  const selectedIds = new Set(selectedPalletRows.value.map((item) => item.id))
+  return palletDialogList.value.filter((item) => !selectedIds.has(item.id))
+})
 
-const productCascaderProps = {
-  emitPath: false,
-  value: 'value',
-  label: 'label',
-  children: 'children'
-}
-
-const productCascaderOptions = computed(() => {
-  const map = new Map<number | string, { value: number | string; label: string; children: any[] }>()
-  for (const item of productList.value) {
-    const categoryKey = item.categoryId ?? item.categoryName ?? ''
-    const categoryLabel = item.categoryName ?? String(categoryKey)
-    if (!map.has(categoryKey)) {
-      map.set(categoryKey, {
-        value: categoryKey,
-        label: categoryLabel,
-        children: []
-      })
-    }
-    const group = map.get(categoryKey)
-    if (group) {
-      group.children.push({
-        value: item.id,
-        label: item.name
-      })
-    }
+function validatePallets(_: any, value: any[], callback: (error?: Error) => void) {
+  if (!Array.isArray(value) || value.length === 0) {
+    callback(new Error(t('ErpStock.Item.validatorPalletRequired')))
+    return
   }
-  return Array.from(map.values())
-})
+  const hasEmptyPackageCount = value.some((item) => !Number.isFinite(Number(item?.packageCount)) || Number(item?.packageCount) <= 0)
+  callback(hasEmptyPackageCount ? new Error(t('ErpStock.Item.validatorPackageCountRequired')) : undefined)
+}
 
 const loadWarehouseList = async () => {
   const categoryType = activeCategoryType.value
@@ -327,6 +533,7 @@ watch(
   () => props.items,
   async (val) => {
     formData.value = val || []
+    normalizeRows(formData.value)
     fillProductNames(formData.value)
     if (isProductMaterialStockIn.value) {
       await loadRowsWarehouseAreas(formData.value)
@@ -335,6 +542,20 @@ watch(
   { immediate: true }
 )
 
+const normalizeRows = (rows: any[]) => {
+  ;(rows || []).forEach((row) => {
+    if (row.relateTask === undefined) {
+      row.relateTask = row.relatedTask ?? false
+    }
+    if (!Array.isArray(row.pallets)) {
+      row.pallets = row.palletId ? [{ palletId: row.palletId, packageCount: row.packageCount }] : []
+    }
+    if (!row.palletCode && Array.isArray(row.pallets) && row.pallets.length > 0) {
+      row.palletCode = row.pallets.map((item) => item.palletCode).filter(Boolean).join(', ')
+    }
+  })
+}
+
 watch(
   () => props.inType,
   async () => {
@@ -367,27 +588,6 @@ watch(
   { deep: true }
 )
 
-/** 合计 */
-const getSummaries = (param: SummaryMethodProps) => {
-  const { columns, data } = param
-  const sums: string[] = []
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = t('common.total')
-      return
-    }
-    if (['count', 'totalPrice'].includes(column.property)) {
-      const sum = getSumValue(data.map((item) => Number(item[column.property])))
-      sums[index] =
-        column.property === 'count' ? erpCountInputFormatter(sum) : erpPriceInputFormatter(sum)
-    } else {
-      sums[index] = ''
-    }
-  })
-
-  return sums
-}
-
 /** 新增按钮操作 */
 const handleAdd = () => {
   const row = {
@@ -403,6 +603,19 @@ const handleAdd = () => {
     purchaseUnitName: undefined,
     supplierName: undefined,
     purchaseUnitConvertQuantity: undefined,
+    relateTask: false,
+    taskId: undefined,
+    taskCode: undefined,
+    taskName: undefined,
+    taskDetailIds: undefined,
+    packagingSchemeRelationId: undefined,
+    packagingSchemeId: undefined,
+    packagingSchemeName: undefined,
+    packageQuantity: undefined,
+    palletPackageQuantity: undefined,
+    palletTotalQuantity: undefined,
+    pallets: [],
+    palletCode: undefined,
     inputUnitType: isProductStockIn.value ? '个' : undefined,
     inputCount: isProductMaterialStockIn.value ? 1 : undefined,
     stockCount: undefined,
@@ -422,6 +635,28 @@ const handleDelete = (index) => {
   formData.value.splice(index, 1)
 }
 
+const isRowRelatedTask = (row: any) => {
+  if (row?.relateTask !== undefined) {
+    return row.relateTask === true || row.relateTask === 1 || row.relateTask === '1'
+  }
+  return row?.relatedTask === true || row?.relatedTask === 1 || row?.relatedTask === '1'
+}
+
+const handleRelatedTaskChange = (row: any) => {
+  row.relatedTask = undefined
+  if (isRowRelatedTask(row)) {
+    clearProduct(row)
+    clearPallet(row)
+    row.count = undefined
+    row.inputCount = undefined
+    return
+  }
+  clearTask(row)
+  clearPallet(row)
+  row.count = isProductMaterialStockIn.value ? undefined : 1
+  row.inputCount = isProductMaterialStockIn.value ? 1 : undefined
+}
+
 /** 处理产品变更 */
 const onChangeProductCode = (productBarCode, row) => {
   const product = productList.value.find((item) => item.barCode === productBarCode)
@@ -451,6 +686,7 @@ const onChangeProduct = (productId, row) => {
 const fillRowByProduct = (row: any, product: any) => {
   row.productUnitName = product.unitName
   row.productBarCode = product.barCode
+  row.productCode = product.barCode
   row.productPrice = product.minPrice
   row.productId = product.id
   row.productName = product.name
@@ -458,9 +694,25 @@ const fillRowByProduct = (row: any, product: any) => {
   row.purchaseUnitName = product.purchaseUnitName
   row.supplierName = getDefaultSupplierName(product)
   row.purchaseUnitConvertQuantity = product.purchaseUnitConvertQuantity
+  fillPackagingSchemeByProduct(row, product)
   syncCountByInputCount(row)
 }
 
+const fillPackagingSchemeByProduct = (row: any, product: any) => {
+  const schemes = Array.isArray(product?.packagingSchemes) ? product.packagingSchemes : []
+  const defaultSchemeId = product?.defaultPackagingSchemeId
+  const scheme =
+    schemes.find((item: any) => Number(item?.defaultStatus) === 1) ||
+    schemes.find((item: any) => item?.packagingSchemeId === defaultSchemeId || item?.id === defaultSchemeId) ||
+    schemes[0]
+  row.packagingSchemeRelationId = scheme?.id
+  row.packagingSchemeId = scheme?.packagingSchemeId ?? scheme?.id
+  row.packagingSchemeName = scheme?.packagingSchemeName ?? scheme?.name
+  row.packageQuantity = scheme?.packageQuantity
+  row.palletPackageQuantity = scheme?.palletPackageQuantity
+  row.palletTotalQuantity = scheme?.palletTotalQuantity
+}
+
 const getDefaultSupplierName = (product: any) => {
   if (!product) return undefined
   if (product.supplierName) return product.supplierName
@@ -471,6 +723,7 @@ const getDefaultSupplierName = (product: any) => {
 const clearProduct = (row: any) => {
   row.productUnitName = undefined
   row.productBarCode = undefined
+  row.productCode = undefined
   row.productPrice = undefined
   row.productId = undefined
   row.productName = undefined
@@ -478,6 +731,12 @@ const clearProduct = (row: any) => {
   row.purchaseUnitName = undefined
   row.supplierName = undefined
   row.purchaseUnitConvertQuantity = undefined
+  row.packagingSchemeRelationId = undefined
+  row.packagingSchemeId = undefined
+  row.packagingSchemeName = undefined
+  row.packageQuantity = undefined
+  row.palletPackageQuantity = undefined
+  row.palletTotalQuantity = undefined
   row.inputCount = isProductMaterialStockIn.value ? undefined : row.inputCount
   row.count = isProductMaterialStockIn.value ? undefined : row.count
 }
@@ -520,14 +779,283 @@ const handleProductDialogRowClick = (row: any) => {
   selectedProductId.value = row.id
 }
 
-const confirmProductSelect = () => {
+const confirmProductSelect = async () => {
   const product = productDialogList.value.find((item) => item.id === selectedProductId.value)
   if (!product || !currentSelectRow.value) return
-  fillRowByProduct(currentSelectRow.value, product)
+  let finalProduct = product
+  if (!Array.isArray(product.packagingSchemes)) {
+    finalProduct = await ProductApi.getProduct(product.id)
+  }
+  fillRowByProduct(currentSelectRow.value, finalProduct)
+  clearPallet(currentSelectRow.value)
   setStockCount(currentSelectRow.value)
   productDialogVisible.value = false
 }
 
+const openTaskSelectDialog = async (row: any) => {
+  currentSelectRow.value = row
+  selectedTaskId.value = row.taskId
+  selectedTaskProductId.value = row.productId
+  selectedTaskData.value = undefined
+  taskProductDialogList.value = getTaskProductOptions(row)
+  taskQueryParams.pageNo = 1
+  taskQueryParams.code = undefined
+  taskDialogVisible.value = true
+  await getTaskDialogList()
+  if (row.taskId) {
+    await loadTaskProductDialogList({ id: row.taskId, code: row.taskCode } as TaskVO)
+  }
+}
+
+const getTaskDialogList = async () => {
+  taskDialogLoading.value = true
+  try {
+    const data = await TaskApi.getTaskPage(taskQueryParams)
+    taskDialogList.value = data?.list || []
+    taskDialogTotal.value = data?.total || 0
+  } finally {
+    taskDialogLoading.value = false
+  }
+}
+
+const handleTaskDialogQuery = () => {
+  taskQueryParams.pageNo = 1
+  selectedTaskId.value = undefined
+  selectedTaskProductId.value = undefined
+  selectedTaskData.value = undefined
+  taskProductDialogList.value = []
+  getTaskDialogList()
+}
+
+const handleTaskDialogRowClick = async (row: TaskVO) => {
+  selectedTaskId.value = row.id
+  selectedTaskProductId.value = undefined
+  await loadTaskProductDialogList(row)
+}
+
+const confirmTaskSelect = async () => {
+  const task = taskDialogList.value.find((item) => item.id === selectedTaskId.value)
+    || ({ id: selectedTaskData.value?.taskId, code: selectedTaskData.value?.taskName } as TaskVO)
+  const product = taskProductDialogList.value.find((item) => item.productId === selectedTaskProductId.value)
+  const data = selectedTaskData.value
+  if (!task || !product || !data || !currentSelectRow.value) return
+  fillRowByTask(currentSelectRow.value, task, data)
+  fillRowByTaskProduct(currentSelectRow.value, product)
+  taskDialogVisible.value = false
+}
+
+const loadTaskProductDialogList = async (task: TaskVO) => {
+  taskSchemeLoading.value = true
+  try {
+    const data = await TaskApi.getTaskDefaultPackagingSchemes(task.id)
+    selectedTaskData.value = data
+    taskProductDialogList.value = Array.isArray(data?.products) ? data.products : []
+  } finally {
+    taskSchemeLoading.value = false
+  }
+}
+
+const handleTaskProductDialogRowClick = (row: any) => {
+  selectedTaskProductId.value = row.productId
+}
+
+const fillRowByTask = (row: any, task: TaskVO, data: any) => {
+  const products = Array.isArray(data?.products) ? data.products : []
+  row.relateTask = true
+  row.relatedTask = undefined
+  row.taskId = data?.taskId ?? task.id
+  row.taskCode = data?.taskName ?? task.code
+  row.taskName = data?.taskName ?? task.code
+  setTaskProductOptions(row, products)
+  clearTaskProduct(row)
+  clearPallet(row)
+}
+
+const getTaskProductOptions = (row: any) => {
+  return Array.isArray(row?.taskProducts) ? row.taskProducts : []
+}
+
+const formatTaskSelection = (row: any) => {
+  return [row.taskCode, row.productName].filter(Boolean).join(' / ')
+}
+
+const setTaskProductOptions = (row: any, products: any[]) => {
+  Object.defineProperty(row, 'taskProducts', {
+    value: products,
+    writable: true,
+    configurable: true,
+    enumerable: false
+  })
+}
+
+const getDefaultTaskProductScheme = (product: any) => {
+  const schemes = Array.isArray(product?.packagingSchemes) ? product.packagingSchemes : []
+  return schemes.find((item: any) => Number(item?.defaultStatus) === 1) || schemes[0]
+}
+
+const fillRowByTaskProduct = (row: any, product: any) => {
+  const scheme = getDefaultTaskProductScheme(product)
+
+  row.productId = product?.productId
+  row.productCode = product?.productCode
+  row.productName = product?.productName
+  row.productBarCode = product?.productCode
+  row.taskDetailIds = product?.taskDetailIds
+  row.packagingSchemeRelationId = scheme?.id
+  row.packagingSchemeId = scheme?.packagingSchemeId
+  row.packagingSchemeName = scheme?.packagingSchemeName
+  row.packageQuantity = scheme?.packageQuantity
+  row.palletPackageQuantity = scheme?.palletPackageQuantity
+  row.palletTotalQuantity = scheme?.palletTotalQuantity
+  row.inputCount = scheme?.palletPackageQuantity
+  row.count = scheme?.palletTotalQuantity
+  clearPallet(row)
+}
+
+const clearTaskProduct = (row: any) => {
+  row.productId = undefined
+  row.productCode = undefined
+  row.productName = undefined
+  row.productBarCode = undefined
+  row.taskDetailIds = undefined
+  row.packagingSchemeRelationId = undefined
+  row.packagingSchemeId = undefined
+  row.packagingSchemeName = undefined
+  row.packageQuantity = undefined
+  row.palletPackageQuantity = undefined
+  row.palletTotalQuantity = undefined
+  row.inputCount = undefined
+  row.count = undefined
+}
+
+const clearTask = (row: any) => {
+  row.taskId = undefined
+  row.taskCode = undefined
+  row.taskName = undefined
+  setTaskProductOptions(row, [])
+  clearTaskProduct(row)
+}
+
+const openPalletSelectDialog = async (row: any) => {
+  currentSelectRow.value = row
+  selectedPalletRows.value = getInitialSelectedPalletRows(row)
+  availablePalletSelection.value = []
+  rightPalletSelection.value = []
+  palletQueryParams.pageNo = 1
+  palletQueryParams.code = undefined
+  palletQueryParams.status = undefined
+  palletDialogVisible.value = true
+  await getPalletDialogList()
+}
+
+const getPalletDialogList = async () => {
+  palletDialogLoading.value = true
+  try {
+    const data = await PalletApi.getPalletPage(palletQueryParams)
+    palletDialogList.value = data?.list || []
+    palletDialogTotal.value = data?.total || 0
+    availablePalletSelection.value = []
+    availablePalletTableRef.value?.clearSelection()
+  } finally {
+    palletDialogLoading.value = false
+  }
+}
+
+const handlePalletDialogQuery = () => {
+  palletQueryParams.pageNo = 1
+  getPalletDialogList()
+}
+
+const handleAvailablePalletSelectionChange = (rows: PalletVO[]) => {
+  availablePalletSelection.value = rows
+}
+
+const handleRightPalletSelectionChange = (rows: any[]) => {
+  rightPalletSelection.value = rows
+}
+
+const toggleAvailablePallet = (row: PalletVO) => {
+  availablePalletTableRef.value?.toggleRowSelection(row)
+}
+
+const toggleRightPallet = (row: any) => {
+  rightPalletTableRef.value?.toggleRowSelection(row)
+}
+
+const addSelectedPallets = () => {
+  const row = currentSelectRow.value
+  const selectedIds = new Set(selectedPalletRows.value.map((item) => item.id))
+  const nextRows = availablePalletSelection.value
+    .filter((pallet) => !selectedIds.has(pallet.id))
+    .map((pallet) => ({
+      ...pallet,
+      packageCount: getPalletPackageCount(row, pallet)
+    }))
+  selectedPalletRows.value = [...selectedPalletRows.value, ...nextRows]
+  availablePalletSelection.value = []
+  availablePalletTableRef.value?.clearSelection()
+}
+
+const removeSelectedPallets = () => {
+  const removeIds = new Set(rightPalletSelection.value.map((item) => item.id))
+  selectedPalletRows.value = selectedPalletRows.value.filter((item) => !removeIds.has(item.id))
+  rightPalletSelection.value = []
+  rightPalletTableRef.value?.clearSelection()
+}
+
+const confirmPalletSelect = () => {
+  if (!currentSelectRow.value) return
+  const row = currentSelectRow.value
+  row.pallets = selectedPalletRows.value.map((pallet) => ({
+    palletId: pallet.id,
+    packageCount: pallet.packageCount
+  }))
+  row.palletCode = selectedPalletRows.value.map((pallet) => pallet.code).filter(Boolean).join(', ')
+  syncCountByPallets(row)
+  palletDialogVisible.value = false
+}
+
+const clearPallet = (row: any) => {
+  row.pallets = []
+  row.palletCode = undefined
+  if (isProductStockIn.value) {
+    row.count = undefined
+  }
+}
+
+const getInitialSelectedPalletRows = (row: any) => {
+  const palletCodes = String(row?.palletCode || '').split(',').map((item) => item.trim()).filter(Boolean)
+  return (row?.pallets || []).map((item: any, index: number) => ({
+    id: item.palletId,
+    code: item.palletCode || palletCodes[index] || String(item.palletId),
+    packageCount: item.packageCount
+  }))
+}
+
+const getPalletPackageCount = (row: any, pallet: PalletVO) => {
+  return pallet.productCount ?? row?.palletPackageQuantity ?? row?.packageQuantity ?? row?.count
+}
+
+const getSelectedPalletItemCount = (pallet: any) => {
+  const packageQuantity = Number(currentSelectRow.value?.packageQuantity)
+  const packageCount = Number(pallet?.packageCount)
+  if (!Number.isFinite(packageQuantity) || !Number.isFinite(packageCount)) return '-'
+  return packageQuantity * packageCount
+}
+
+const syncCountByPallets = (row: any) => {
+  const packageQuantity = Number(row?.packageQuantity)
+  if (!Array.isArray(row?.pallets) || !Number.isFinite(packageQuantity)) {
+    row.count = undefined
+    return
+  }
+  const total = row.pallets.reduce((sum: number, pallet: any) => {
+    const packageCount = Number(pallet?.packageCount)
+    return Number.isFinite(packageCount) ? sum + packageQuantity * packageCount : sum
+  }, 0)
+  row.count = total || undefined
+}
+
 watch(
   () => formData.value.map((row) => [row.inputCount, row.purchaseUnitConvertQuantity]),
   () => {
@@ -539,6 +1067,7 @@ watch(
 
 const syncCountByInputCount = (row: any) => {
   if (!isProductMaterialStockIn.value) return
+  if (isRowRelatedTask(row)) return
   const inputCount = Number(row.inputCount)
   const convertQuantity = Number(row.purchaseUnitConvertQuantity)
   if (!Number.isFinite(inputCount)) {
@@ -585,6 +1114,7 @@ const fillProductNames = (rows: any[]) => {
     if (!product) return
     row.productId = row.productId || product.id
     row.productBarCode = row.productBarCode || product.barCode
+    row.productCode = row.productCode || product.barCode
     row.productName = row.productName || product.name
     row.productUnitName = row.productUnitName || product.unitName
     row.productPrice = row.productPrice ?? product.minPrice
@@ -650,4 +1180,71 @@ onMounted(async () => {
   justify-content: flex-end;
   padding: 12px 0 0;
 }
+
+.task-product-select {
+  display: grid;
+  gap: 6px;
+}
+
+.task-select-dialog {
+  display: grid;
+  gap: 10px;
+}
+
+.task-select-dialog__section-title {
+  color: var(--el-text-color-primary);
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.pallet-transfer {
+  display: grid;
+  grid-template-columns: minmax(520px, 1fr) 72px minmax(420px, 0.85fr);
+  gap: 18px;
+  align-items: center;
+}
+
+.pallet-transfer__panel {
+  min-width: 0;
+}
+
+.pallet-transfer__title {
+  margin-bottom: 8px;
+  color: var(--el-text-color-primary);
+  font-weight: 600;
+}
+
+.pallet-transfer__actions {
+  display: grid;
+  gap: 10px;
+  justify-items: center;
+  padding-top: 36px;
+}
+
+.pallet-transfer__actions :deep(.el-button + .el-button) {
+  margin-left: 0;
+}
+
+.product-task-info {
+  display: grid;
+  gap: 2px;
+  line-height: 18px;
+}
+
+.product-task-info__item {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  gap: 4px;
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.product-task-info__item strong {
+  color: var(--el-text-color-secondary);
+  font-weight: 400;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>
diff --git a/src/views/erp/stock/overview/index.vue b/src/views/erp/stock/overview/index.vue
new file mode 100644
index 00000000..867e0d9b
--- /dev/null
+++ b/src/views/erp/stock/overview/index.vue
@@ -0,0 +1,577 @@
+<template>
+  <div class="stock-overview">
+    <ContentWrap>
+      <el-form
+ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px stock-overview__query"
+        label-width="auto">
+        <el-form-item :label="t('ErpStock.Overview.materialCategory')" prop="categoryType">
+          <el-select
+v-model="queryParams.categoryType" clearable :placeholder="t('common.selectText')"
+            class="!w-220px">
+            <el-option v-for="item in categoryTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="t('ErpStock.Stock.warehouse')" prop="warehouseId">
+          <el-select
+v-model="queryParams.warehouseId" clearable filterable
+            :placeholder="t('ErpStock.Stock.placeholderWarehouse')" class="!w-220px">
+            <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="t('ErpStock.Overview.location')" prop="areaId">
+          <el-select
+v-model="queryParams.areaId" clearable filterable :placeholder="t('common.selectText')"
+            class="!w-220px">
+            <el-option v-for="item in areaOptions" :key="item.id" :label="item.areaName" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="t('ErpStock.Overview.dateRange')" prop="dateRange">
+          <el-date-picker
+v-model="queryParams.dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+            :start-placeholder="t('ErpStock.Record.placeholderCreateTimeStart')"
+            :end-placeholder="t('ErpStock.Record.placeholderCreateTimeEnd')"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-280px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleQuery">
+            <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> {{ t('common.reset') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <div class="stock-overview__cards">
+      <ContentWrap
+v-for="item in summaryCards" :key="item.title" class="stock-overview__card-wrap"
+        :body-style="{ padding: '22px 24px' }">
+        <div class="stock-overview__card">
+          <div class="stock-overview__card-main">
+            <div class="stock-overview__card-title">{{ item.title }}</div>
+            <div v-for="line in item.lines" :key="line" class="stock-overview__card-line">
+              {{ line }}
+            </div>
+          </div>
+          <Icon :icon="item.icon" :class="['stock-overview__card-icon', `is-${item.color}`]" :size="34" />
+        </div>
+        <div v-if="item.tip" class="stock-overview__card-tip">{{ item.tip }}</div>
+      </ContentWrap>
+    </div>
+
+    <div class="stock-overview__tables">
+      <ContentWrap :title="t('ErpStock.Overview.stockDetail')" class="stock-overview__stock">
+        <el-table
+v-loading="stockLoading" :data="stockList" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+          height="520">
+          <el-table-column :label="t('ErpStock.Stock.code')" align="center" sortable prop="barCode" min-width="130" />
+          <el-table-column :label="t('ErpStock.Stock.name')" align="center" sortable prop="name" min-width="150">
+            <template #default="{ row }">
+              {{ row.name || row.productName || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+:label="t('ErpStock.Overview.materialCategory')" align="center" prop="categoryType"
+            min-width="100">
+            <template #default="{ row }">
+              <el-tag :type="getCategoryTagType(row.categoryType)">
+                {{ getCategoryLabel(row.categoryType) }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+:label="t('ErpStock.Stock.subCategory')" align="center" prop="categoryName"
+            min-width="110" />
+          <el-table-column :label="t('ErpStock.Stock.warehouse')" align="center" prop="warehouseName" min-width="110" />
+          <el-table-column :label="t('ErpStock.Overview.location')" align="center" prop="areaName" min-width="110" />
+          <el-table-column :label="t('ErpStock.Stock.stockDisplay')" align="center" prop="stockDisplay" min-width="180">
+            <template #default="{ row }">
+              <span v-if="row.stockDisplay" class="stock-overview__display">{{ row.stockDisplay }}</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('ErpStock.Stock.count')" align="center" sortable prop="count" min-width="110">
+            <template #default="{ row }">
+              {{ formatNumber(row.count) }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('ErpStock.Stock.unit')" align="center" prop="unitName" min-width="80" />
+          <el-table-column :label="t('ErpStock.Overview.latestChangeTime')" align="center" min-width="170">
+            <template #default="{ row }">
+              {{ formatStockTime(getLatestChangeTime(row)) }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <Pagination
+:total="stockTotal" v-model:page="stockQuery.pageNo" v-model:limit="stockQuery.pageSize"
+          @pagination="getStockList" />
+      </ContentWrap>
+
+      <ContentWrap
+:title="t('ErpStock.Overview.recentRecord')" class="stock-overview__record"
+        :body-style="{ padding: '10px 14px 16px' }">
+        <template #header>
+          <el-button link type="primary" class="stock-overview__more" @click="goRecordPage">
+            {{ t('ErpStock.Overview.more') }}
+            <Icon icon="ep:arrow-right" class="ml-2px" />
+          </el-button>
+        </template>
+        <template #default>
+          <el-table
+v-loading="recordLoading" :data="recordList" :stripe="true" :show-overflow-tooltip="true"
+            row-key="id" height="562">
+            <el-table-column :label="t('ErpStock.Overview.time')" align="center" min-width="160">
+              <template #default="{ row }">
+                {{ formatStockTime(row.recordTime || row.createTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column :label="t('ErpStock.Record.bizType')" align="center" prop="bizDirection" min-width="90">
+              <template #default="{ row }">
+                <el-tag v-if="row.bizDirection" :type="getDirectionTagType(row.bizDirection)">
+                  {{ formatDirection(row.bizDirection) }}
+                </el-tag>
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
+            <el-table-column :label="t('ErpStock.Overview.material')" align="center" min-width="150">
+              <template #default="{ row }">
+                <div class="stock-overview__material">
+                  <span>{{ row.productName || '-' }}</span>
+                  <span v-if="row.bizNo">{{ row.bizNo }}</span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column :label="t('ErpStock.Record.count')" align="center" min-width="120">
+              <template #default="{ row }">
+                <span :class="getDirectionClass(row.bizDirection)">
+                  {{ formatRecordCount(row) }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+:label="t('ErpStock.Record.creatorName')" align="center" prop="creatorName"
+              min-width="90" />
+          </el-table>
+        </template>
+      </ContentWrap>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getDictObj, getIntDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import { StockApi, StockVO } from '@/api/erp/stock/stock'
+import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+
+defineOptions({ name: 'ErpStockOverview' })
+
+const router = useRouter()
+const { t } = useI18n()
+const dictStore = useDictStoreWithOut()
+
+const queryFormRef = ref()
+const warehouseList = ref<WarehouseVO[]>([])
+const categoryTypeOptions = computed(() => getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE))
+const queryParams = reactive<{
+  categoryType?: number
+  warehouseId?: number
+  areaId?: number
+  dateRange: string[]
+}>({
+  categoryType: undefined,
+  warehouseId: undefined,
+  areaId: undefined,
+  dateRange: []
+})
+
+const stockLoading = ref(false)
+const recordLoading = ref(false)
+const stockList = ref<StockVO[]>([])
+const recordList = ref<StockRecordVO[]>([])
+const stockTotal = ref(0)
+const stockQuery = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+const recordQuery = reactive({
+  pageNo: 1,
+  pageSize: 9
+})
+
+const summaryCards = computed(() => [
+  {
+    title: t('ErpStock.Overview.cards.finishedGoods.title'),
+    icon: 'ep:box',
+    color: 'blue',
+    lines: [
+      t('ErpStock.Overview.cards.finishedGoods.line1'),
+      t('ErpStock.Overview.cards.finishedGoods.line2'),
+      t('ErpStock.Overview.cards.finishedGoods.line3')
+    ],
+    tip: t('ErpStock.Overview.cards.finishedGoods.tip')
+  },
+  {
+    title: t('ErpStock.Overview.cards.rawMaterial.title'),
+    icon: 'ep:collection',
+    color: 'green',
+    lines: [
+      t('ErpStock.Overview.cards.rawMaterial.line1'),
+      t('ErpStock.Overview.cards.rawMaterial.line2'),
+      t('ErpStock.Overview.cards.rawMaterial.line3'),
+      t('ErpStock.Overview.cards.rawMaterial.line4')
+    ],
+    tip: t('ErpStock.Overview.cards.rawMaterial.tip')
+  },
+  {
+    title: t('ErpStock.Overview.cards.sparePart.title'),
+    icon: 'ep:setting',
+    color: 'orange',
+    lines: [
+      t('ErpStock.Overview.cards.sparePart.line1'),
+      t('ErpStock.Overview.cards.sparePart.line2'),
+      t('ErpStock.Overview.cards.sparePart.line3'),
+      t('ErpStock.Overview.cards.sparePart.line4')
+    ],
+    tip: t('ErpStock.Overview.cards.sparePart.tip')
+  },
+  {
+    title: t('ErpStock.Overview.cards.todayIn.title'),
+    icon: 'ep:download',
+    color: 'blue',
+    lines: [
+      t('ErpStock.Overview.cards.todayIn.line1'),
+      t('ErpStock.Overview.cards.todayIn.line2'),
+      t('ErpStock.Overview.cards.todayIn.line3'),
+      t('ErpStock.Overview.cards.todayIn.line4'),
+      t('ErpStock.Overview.cards.todayIn.line5')
+    ]
+  },
+  {
+    title: t('ErpStock.Overview.cards.todayOut.title'),
+    icon: 'ep:upload',
+    color: 'green',
+    lines: [
+      t('ErpStock.Overview.cards.todayOut.line1'),
+      t('ErpStock.Overview.cards.todayOut.line2'),
+      t('ErpStock.Overview.cards.todayOut.line3'),
+      t('ErpStock.Overview.cards.todayOut.line4'),
+      t('ErpStock.Overview.cards.todayOut.line5')
+    ]
+  },
+  {
+    title: t('ErpStock.Overview.cards.warning.title'),
+    icon: 'ep:warning-filled',
+    color: 'red',
+    lines: [
+      t('ErpStock.Overview.cards.warning.line1'),
+      t('ErpStock.Overview.cards.warning.line2'),
+      t('ErpStock.Overview.cards.warning.line3'),
+      t('ErpStock.Overview.cards.warning.line4')
+    ]
+  }
+])
+
+const areaOptions = computed(() => {
+  const areaMap = new Map<number, { id: number; areaName: string }>()
+  warehouseList.value.forEach((warehouse) => {
+    warehouse.areaList?.forEach((area) => {
+      areaMap.set(area.id, {
+        id: area.id,
+        areaName: `${warehouse.name || ''}${warehouse.name ? ' / ' : ''}${area.areaName}`
+      })
+    })
+  })
+  return Array.from(areaMap.values())
+})
+
+const filterEmptyParams = (params: Record<string, any>) => {
+  return Object.fromEntries(
+    Object.entries(params).filter(([, value]) => {
+      if (Array.isArray(value)) return value.length > 0
+      return value !== undefined && value !== null && value !== ''
+    })
+  )
+}
+
+const buildBaseQueryParams = () => {
+  const [beginTime, endTime] = queryParams.dateRange || []
+  return filterEmptyParams({
+    categoryType: queryParams.categoryType,
+    warehouseId: queryParams.warehouseId,
+    areaId: queryParams.areaId,
+    createTime: beginTime && endTime ? [beginTime, endTime] : undefined
+  })
+}
+
+const getStockList = async () => {
+  stockLoading.value = true
+  try {
+    const data = await StockApi.getStockPage(
+      filterEmptyParams({
+        ...buildBaseQueryParams(),
+        pageNo: stockQuery.pageNo,
+        pageSize: stockQuery.pageSize
+      })
+    )
+    stockList.value = data.list || []
+    stockTotal.value = data.total || 0
+  } finally {
+    stockLoading.value = false
+  }
+}
+
+const getRecordList = async () => {
+  recordLoading.value = true
+  try {
+    const data = await StockRecordApi.getStockRecordPage(
+      filterEmptyParams({
+        ...buildBaseQueryParams(),
+        pageNo: recordQuery.pageNo,
+        pageSize: recordQuery.pageSize
+      })
+    )
+    recordList.value = data.list || []
+  } finally {
+    recordLoading.value = false
+  }
+}
+
+const getList = async () => {
+  await Promise.all([getStockList(), getRecordList()])
+}
+
+const handleQuery = () => {
+  stockQuery.pageNo = 1
+  recordQuery.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value?.resetFields()
+  handleQuery()
+}
+
+const goRecordPage = () => {
+  router.push({ path: '/warehouse/record' })
+}
+
+const getCategoryLabel = (value?: number | string) => {
+  return getDictObj(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE, value)?.label || '-'
+}
+
+const getCategoryTagType = (value?: number | string) => {
+  const dict = getDictObj(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE, value)
+  const colorType = String(dict?.colorType || '')
+  return ['success', 'info', 'warning', 'danger'].includes(colorType) ? colorType : 'primary'
+}
+
+const formatNumber = (value: number | string | undefined) => {
+  if (value === undefined || value === null || value === '') return '-'
+  const num = Number(value)
+  return Number.isFinite(num) ? num.toLocaleString() : String(value)
+}
+
+const formatStockTime = (value: any) => {
+  return value ? formatDate(value, 'YYYY-MM-DD HH:mm:ss') : '-'
+}
+
+const getLatestChangeTime = (row: any) => {
+  return (
+    row.latestChangeTime ??
+    row.latestInTime ??
+    row.lastInTime ??
+    row.recentInTime ??
+    row.latestStockInTime ??
+    row.lastStockInTime ??
+    row.latestOutTime ??
+    row.lastOutTime ??
+    row.recentOutTime ??
+    row.latestStockOutTime ??
+    row.lastStockOutTime
+  )
+}
+
+const isStockIn = (direction?: string) => ['入库', 'Inbound'].includes(String(direction || ''))
+const isStockOut = (direction?: string) => ['出库', 'Outbound'].includes(String(direction || ''))
+
+const formatDirection = (direction?: string) => {
+  if (isStockIn(direction)) return t('ErpStock.Overview.stockIn')
+  if (isStockOut(direction)) return t('ErpStock.Overview.stockOut')
+  return direction || '-'
+}
+
+const getDirectionClass = (direction?: string) => {
+  if (isStockIn(direction)) return 'stock-overview__count-in'
+  if (isStockOut(direction)) return 'stock-overview__count-out'
+  return ''
+}
+
+const getDirectionTagType = (direction?: string) => {
+  if (isStockIn(direction)) return 'success'
+  if (isStockOut(direction)) return 'danger'
+  return 'info'
+}
+
+const formatRecordCount = (row: StockRecordVO) => {
+  const unit = row.unitName ? ` ${row.unitName}` : ''
+  const num = Number(row.count)
+  if (!Number.isFinite(num)) return `${row.count ?? '-'}${unit}`
+  const value = Math.abs(num).toLocaleString()
+  if (isStockIn(row.bizDirection)) return `+${value}${unit}`
+  if (isStockOut(row.bizDirection)) return `-${value}${unit}`
+  return `${num.toLocaleString()}${unit}`
+}
+
+onMounted(async () => {
+  await dictStore.setDictMap()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  await getList()
+})
+</script>
+
+<style scoped lang="scss">
+.stock-overview {
+  .stock-overview__query {
+    display: flex;
+    align-items: flex-start;
+  }
+
+  .stock-overview__cards {
+    display: grid;
+    grid-template-columns: repeat(6, minmax(0, 1fr));
+    gap: 14px;
+    margin-bottom: 15px;
+  }
+
+  .stock-overview__card-wrap {
+    margin-bottom: 0 !important;
+  }
+
+  .stock-overview__card {
+    display: flex;
+    justify-content: space-between;
+    min-height: 174px;
+  }
+
+  .stock-overview__card-main {
+    min-width: 0;
+  }
+
+  .stock-overview__card-title {
+    margin-bottom: 16px;
+    color: var(--el-text-color-primary);
+    font-size: 16px;
+    font-weight: 700;
+  }
+
+  .stock-overview__card-line {
+    margin-bottom: 13px;
+    color: var(--el-text-color-regular);
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 1.25;
+  }
+
+  .stock-overview__card-tip {
+    color: var(--el-text-color-placeholder);
+    font-size: 12px;
+    font-weight: 600;
+  }
+
+  .stock-overview__card-icon {
+    flex: none;
+
+    &.is-blue {
+      color: var(--el-color-primary);
+    }
+
+    &.is-green {
+      color: var(--el-color-success);
+    }
+
+    &.is-orange {
+      color: var(--el-color-warning);
+    }
+
+    &.is-red {
+      color: var(--el-color-danger);
+    }
+  }
+
+  .stock-overview__tables {
+    display: grid;
+    grid-template-columns: minmax(0, 1.7fr) minmax(460px, 1fr);
+    gap: 15px;
+    align-items: start;
+  }
+
+  .stock-overview__stock,
+  .stock-overview__record {
+    margin-bottom: 0 !important;
+  }
+
+  .stock-overview__more {
+    margin-left: auto;
+    font-weight: 600;
+  }
+
+  .stock-overview__display {
+    color: var(--el-color-primary);
+    font-weight: 600;
+  }
+
+  .stock-overview__material {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    line-height: 1.25;
+
+    span:last-child {
+      color: var(--el-text-color-secondary);
+      font-size: 12px;
+    }
+  }
+
+  .stock-overview__count-in {
+    color: var(--el-color-success);
+    font-weight: 700;
+  }
+
+  .stock-overview__count-out {
+    color: var(--el-color-danger);
+    font-weight: 700;
+  }
+}
+
+@media (max-width: 1600px) {
+  .stock-overview {
+    .stock-overview__cards {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
+  }
+}
+
+@media (max-width: 1200px) {
+  .stock-overview {
+    .stock-overview__tables {
+      grid-template-columns: 1fr;
+    }
+  }
+}
+
+@media (max-width: 768px) {
+  .stock-overview {
+    .stock-overview__query {
+      display: block;
+    }
+
+    .stock-overview__cards {
+      grid-template-columns: 1fr;
+    }
+  }
+}
+</style>
diff --git a/src/views/erp/stock/pallet/PalletForm.vue b/src/views/erp/stock/pallet/PalletForm.vue
new file mode 100644
index 00000000..83f27307
--- /dev/null
+++ b/src/views/erp/stock/pallet/PalletForm.vue
@@ -0,0 +1,716 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.code')" prop="code">
+            <el-row :gutter="10" class="!w-full">
+              <el-col :span="18">
+                <el-input
+                  v-model="formData.code"
+                  :placeholder="t('ErpStock.Pallet.placeholderCode')"
+                  :disabled="Boolean(formData.isCode) || formType === 'update'"
+                />
+              </el-col>
+              <el-col :span="6">
+                <el-switch
+                  v-model="formData.isCode"
+                  :disabled="formType === 'update'"
+                  @change="handleCodeAutoChange"
+                />
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.palletType')" prop="palletType">
+            <el-select
+              v-model="formData.palletType"
+              :placeholder="t('ErpStock.Pallet.placeholderPalletType')"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.STORAGE_PALLET_TYPES)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.specification')" prop="specification">
+            <div class="pallet-spec-input">
+              <el-input-number
+                v-model="specificationParts.length"
+                :min="0"
+                :precision="0"
+                :controls="false"
+                :placeholder="t('ErpStock.Pallet.placeholderLength')"
+              />
+              <span>x</span>
+              <el-input-number
+                v-model="specificationParts.width"
+                :min="0"
+                :precision="0"
+                :controls="false"
+                :placeholder="t('ErpStock.Pallet.placeholderWidth')"
+              />
+              <span>x</span>
+              <el-input-number
+                v-model="specificationParts.height"
+                :min="0"
+                :precision="0"
+                :controls="false"
+                :placeholder="t('ErpStock.Pallet.placeholderHeight')"
+              />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.ratedLoadWeight')" prop="ratedLoadWeight">
+            <el-input-number
+              v-model="formData.ratedLoadWeight"
+              :placeholder="t('ErpStock.Pallet.placeholderRatedLoadWeight')"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.unit')" prop="unit">
+            <el-input v-model="formData.unit" :placeholder="t('ErpStock.Pallet.placeholderUnit')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.status')" prop="status">
+            <el-select
+              v-model="formData.status"
+              :placeholder="t('ErpStock.Pallet.placeholderStatus')"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.STORAGE_PALLET_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.warehouseId')" prop="warehouseId">
+            <el-input :model-value="selectedWarehouseText" readonly :placeholder="t('ErpStock.Pallet.placeholderWarehouseId')">
+              <template #append>
+                <el-button @click="openWarehouseDialog">{{ t('common.select') }}</el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.areaId')" prop="areaId">
+            <el-input :model-value="selectedAreaText" readonly :placeholder="t('ErpStock.Pallet.placeholderAreaId')">
+              <template #append>
+                <el-button @click="openAreaDialog">{{ t('common.select') }}</el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.planCode')" prop="planCode">
+            <el-input v-model="formData.planCode" :placeholder="t('ErpStock.Pallet.placeholderPlanCode')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.productId')" prop="productId">
+            <el-select
+              v-model="formData.productId"
+              :placeholder="t('ErpStock.Pallet.placeholderProductId')"
+              clearable
+              filterable
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.productCount')" prop="productCount">
+            <el-input-number
+              v-model="formData.productCount"
+              :placeholder="t('ErpStock.Pallet.placeholderProductCount')"
+              :min="0"
+              :precision="0"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.purchaseDate')" prop="purchaseDate">
+            <el-date-picker
+              v-model="formData.purchaseDate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              :placeholder="t('ErpStock.Pallet.placeholderPurchaseDate')"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ErpStock.Pallet.useDate')" prop="useDate">
+            <el-date-picker
+              v-model="formData.useDate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              :placeholder="t('ErpStock.Pallet.placeholderUseDate')"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="formType === 'update'" :span="24">
+          <el-form-item :label="t('ErpStock.Pallet.qrcode')" prop="qrcode">
+            <QrcodeActionCard
+              :image-url="formData.qrcode"
+              :print-id="formData.id"
+              :print-title="`${formData.code || t('ErpStock.Pallet.code')}二维码打印预览`"
+              :empty-text="t('ErpStock.Pallet.qrcodeEmpty')"
+              :refresh-url="getQrcodeRefreshUrl()"
+              :refresh-disabled="!formData.id || !formData.code"
+              :refresh-confirm-text="t('ErpStock.Pallet.qrcodeRefreshConfirm')"
+              :print-data="buildPrintData()"
+              @refresh-success="handleQrcodeRefreshSuccess"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item :label="t('ErpStock.Pallet.remark')" prop="remark">
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              :placeholder="t('ErpStock.Pallet.placeholderRemark')"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ t('common.ok') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+
+  <Dialog :title="t('ErpStock.Check.selectWarehouseDialogTitle')" v-model="warehouseDialogVisible" width="1000px">
+    <el-form :model="warehouseQueryParams" :inline="true" label-width="auto" class="-mb-15px">
+      <el-form-item :label="t('ErpStock.Warehouse.name')">
+        <el-input
+          v-model="warehouseQueryParams.name"
+          clearable
+          :placeholder="t('ErpStock.Warehouse.placeholderName')"
+          class="!w-240px"
+          @keyup.enter="handleWarehouseQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleWarehouseQuery">
+          <Icon icon="ep:search" class="mr-5px" />{{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetWarehouseQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />{{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      v-loading="warehouseLoading"
+      :data="warehouseTableList"
+      row-key="id"
+      highlight-current-row
+      @row-click="handleWarehouseRowClick"
+    >
+      <el-table-column align="center" width="55">
+        <template #default="scope">
+          <el-radio
+            :model-value="warehouseSelection?.id"
+            :value="scope.row.id"
+            @change="handleWarehouseRowClick(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Warehouse.name')" align="center" prop="name" min-width="160" sortable />
+      <el-table-column :label="t('ErpStock.Warehouse.categoryType')" align="center" prop="categoryType" min-width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Warehouse.address')" align="center" prop="address" min-width="180" show-overflow-tooltip />
+      <el-table-column :label="t('ErpStock.Warehouse.principal')" align="center" prop="principal" min-width="110" />
+      <el-table-column :label="t('ErpStock.Warehouse.status')" align="center" prop="status" min-width="100" sortable>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Warehouse.createTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" sortable />
+    </el-table>
+    <div class="pallet-dialog-pagination">
+      <Pagination
+        :total="warehouseTotal"
+        v-model:page="warehouseQueryParams.pageNo"
+        v-model:limit="warehouseQueryParams.pageSize"
+        @pagination="getWarehouseTableList"
+      />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="confirmWarehouseSelection">{{ t('common.ok') }}</el-button>
+      <el-button @click="warehouseDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+
+  <Dialog :title="t('ErpStock.Check.selectAreaDialogTitle')" v-model="areaDialogVisible" width="1000px">
+    <el-form :model="areaQueryParams" :inline="true" label-width="auto" class="-mb-15px">
+      <el-form-item :label="t('ErpStock.WarehouseArea.areaCode')">
+        <el-input
+          v-model="areaQueryParams.areaCode"
+          clearable
+          :placeholder="t('ErpStock.WarehouseArea.placeholderAreaCode')"
+          class="!w-240px"
+          @keyup.enter="handleAreaQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.WarehouseArea.areaName')">
+        <el-input
+          v-model="areaQueryParams.areaName"
+          clearable
+          :placeholder="t('ErpStock.WarehouseArea.placeholderAreaName')"
+          class="!w-240px"
+          @keyup.enter="handleAreaQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleAreaQuery">
+          <Icon icon="ep:search" class="mr-5px" />{{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetAreaQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />{{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      v-loading="areaLoading"
+      :data="areaTableList"
+      row-key="id"
+      highlight-current-row
+      @row-click="handleAreaRowClick"
+    >
+      <el-table-column align="center" width="55">
+        <template #default="scope">
+          <el-radio
+            :model-value="areaSelection?.id"
+            :value="scope.row.id"
+            @change="handleAreaRowClick(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.WarehouseArea.warehouseId')" align="center" prop="warehouseId" min-width="140" sortable>
+        <template #default="scope">
+          {{ getWarehouseName(scope.row.warehouseId) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.WarehouseArea.areaCode')" align="center" prop="areaCode" min-width="130" sortable />
+      <el-table-column :label="t('ErpStock.WarehouseArea.areaName')" align="center" prop="areaName" min-width="130" sortable />
+      <el-table-column :label="t('ErpStock.WarehouseArea.areaSize')" align="center" prop="areaSize" min-width="100" />
+      <el-table-column :label="t('ErpStock.WarehouseArea.description')" align="center" prop="description" min-width="160" show-overflow-tooltip />
+      <el-table-column :label="t('ErpStock.WarehouseArea.status')" align="center" prop="status" min-width="100" sortable>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.WarehouseArea.createTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" sortable />
+    </el-table>
+    <div class="pallet-dialog-pagination">
+      <Pagination
+        :total="areaTotal"
+        v-model:page="areaQueryParams.pageNo"
+        v-model:limit="areaQueryParams.pageSize"
+        @pagination="getAreaTableList"
+      />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="confirmAreaSelection">{{ t('common.ok') }}</el-button>
+      <el-button @click="areaDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { PalletApi, PalletVO } from '@/api/erp/stock/pallet'
+import { dateFormatter } from '@/utils/formatTime'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/erp/stock/warehousearea'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue'
+
+defineOptions({ name: 'PalletForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
+const formRef = ref()
+const warehouseOptions = ref<WarehouseVO[]>([])
+const areaOptions = ref<WarehouseAreaVO[]>([])
+const productList = ref<ProductVO[]>([])
+const selectedWarehouse = ref<WarehouseVO | undefined>()
+const selectedArea = ref<WarehouseAreaVO | undefined>()
+
+const warehouseDialogVisible = ref(false)
+const warehouseLoading = ref(false)
+const warehouseTableList = ref<WarehouseVO[]>([])
+const warehouseTotal = ref(0)
+const warehouseSelection = ref<WarehouseVO | undefined>()
+const warehouseQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined as string | undefined
+})
+
+const areaDialogVisible = ref(false)
+const areaLoading = ref(false)
+const areaTableList = ref<WarehouseAreaVO[]>([])
+const areaTotal = ref(0)
+const areaSelection = ref<WarehouseAreaVO | undefined>()
+const areaQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  areaCode: undefined as string | undefined,
+  areaName: undefined as string | undefined
+})
+
+const formData = ref<PalletVO>({
+  code: undefined,
+  isCode: true,
+  palletType: undefined,
+  specification: undefined,
+  ratedLoadWeight: undefined,
+  unit: 'kg',
+  status: undefined,
+  warehouseId: undefined,
+  areaId: undefined,
+  planCode: undefined,
+  productId: undefined,
+  productCount: undefined,
+  qrcode: undefined,
+  purchaseDate: undefined,
+  useDate: undefined,
+  remark: undefined
+})
+const specificationParts = reactive({
+  length: undefined as number | undefined,
+  width: undefined as number | undefined,
+  height: undefined as number | undefined
+})
+
+const selectedWarehouseText = computed(() => selectedWarehouse.value?.name ?? '')
+const selectedAreaText = computed(() => selectedArea.value?.areaName ?? '')
+
+const validateCode = (_rule, value, callback) => {
+  if (Boolean(formData.value.isCode)) {
+    callback()
+    return
+  }
+  if (value === undefined || value === null || String(value).trim() === '') {
+    callback(new Error(t('ErpStock.Pallet.validatorCodeRequired')))
+    return
+  }
+  callback()
+}
+
+const formRules = reactive({
+  code: [{ validator: validateCode, trigger: ['blur', 'change'] }],
+  palletType: [{ required: true, message: t('ErpStock.Pallet.validatorPalletTypeRequired'), trigger: 'change' }],
+  status: [{ required: true, message: t('ErpStock.Pallet.validatorStatusRequired'), trigger: 'change' }]
+})
+
+const open = async (type: string, row?: PalletVO) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  await Promise.all([getWarehouseOptions(), getAreaOptions(), getProductList()])
+  if (type === 'update' && row) {
+    formData.value = {
+      ...row,
+      isCode: false
+    }
+    parseSpecification(row.specification)
+    await hydrateSelectedWarehouseArea()
+  }
+}
+defineExpose({ open })
+
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = { ...formData.value }
+    delete data.qrcode
+    data.specification = buildSpecification()
+    if (data.isCode) {
+      data.code = undefined
+    }
+    if (formType.value === 'create') {
+      await PalletApi.createPallet(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PalletApi.updatePallet(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const getWarehouseOptions = async () => {
+  warehouseOptions.value = await WarehouseApi.getWarehouseSimpleList()
+}
+
+const getAreaOptions = async () => {
+  const data = await WarehouseAreaApi.getWarehouseAreaPage({ pageNo: 1, pageSize: 100 })
+  areaOptions.value = data.list ?? []
+}
+
+const getProductList = async () => {
+  productList.value = await ProductApi.getProductSimpleList()
+}
+
+const buildPrintData = () => {
+  return {
+    id: formData.value.id,
+    code: formData.value.code,
+    palletType: formData.value.palletType,
+    specification: buildSpecification() || formData.value.specification,
+    warehouseId: formData.value.warehouseId,
+    areaId: formData.value.areaId,
+    qrcodeUrl: formData.value.qrcode
+  }
+}
+
+const getQrcodeRefreshUrl = () => {
+  if (!formData.value.id || !formData.value.code) return ''
+  return `/erp/pallet/regenerate-code?id=${formData.value.id}&code=${encodeURIComponent(String(formData.value.code))}`
+}
+
+const handleQrcodeRefreshSuccess = (data: any) => {
+  const qrcode = data?.qrcode ?? data?.qrcodeUrl
+  if (qrcode) {
+    formData.value.qrcode = qrcode
+  }
+}
+
+const parseSpecification = (value?: string) => {
+  const [length, width, height] = String(value || '')
+    .split(/[xX×*]/)
+    .map((item) => Number(item.trim()))
+  specificationParts.length = Number.isFinite(length) ? length : undefined
+  specificationParts.width = Number.isFinite(width) ? width : undefined
+  specificationParts.height = Number.isFinite(height) ? height : undefined
+}
+
+const buildSpecification = () => {
+  const { length, width, height } = specificationParts
+  const isEmpty = (value?: number | null) => value === undefined || value === null
+  if (isEmpty(length) && isEmpty(width) && isEmpty(height)) {
+    return undefined
+  }
+  return `${length ?? ''}x${width ?? ''}x${height ?? ''}`
+}
+
+const hydrateSelectedWarehouseArea = async () => {
+  selectedWarehouse.value = warehouseOptions.value.find((item) => item.id === formData.value.warehouseId)
+  selectedArea.value = areaOptions.value.find((item) => item.id === formData.value.areaId)
+  if (!selectedArea.value && formData.value.warehouseId && formData.value.areaId) {
+    const data = await WarehouseAreaApi.getWarehouseAreaPage({
+      pageNo: 1,
+      pageSize: 100,
+      warehouseId: formData.value.warehouseId
+    })
+    const areas = data?.list ?? []
+    areaOptions.value = areas
+    selectedArea.value = areas.find((item) => item.id === formData.value.areaId)
+  }
+}
+
+const getWarehouseName = (warehouseId?: number) => {
+  return warehouseOptions.value.find((item) => item.id === warehouseId)?.name ?? '-'
+}
+
+const clearAreaSelection = () => {
+  formData.value.areaId = undefined
+  selectedArea.value = undefined
+}
+
+const getWarehouseTableList = async () => {
+  warehouseLoading.value = true
+  try {
+    const data = await WarehouseApi.getWarehousePage(warehouseQueryParams)
+    warehouseTableList.value = data?.list ?? []
+    warehouseTotal.value = data?.total ?? 0
+  } finally {
+    warehouseLoading.value = false
+  }
+}
+
+const openWarehouseDialog = async () => {
+  warehouseDialogVisible.value = true
+  warehouseSelection.value = selectedWarehouse.value
+  await getWarehouseTableList()
+}
+
+const handleWarehouseQuery = () => {
+  warehouseQueryParams.pageNo = 1
+  getWarehouseTableList()
+}
+
+const resetWarehouseQuery = () => {
+  warehouseQueryParams.pageNo = 1
+  warehouseQueryParams.name = undefined
+  getWarehouseTableList()
+}
+
+const handleWarehouseRowClick = (row: WarehouseVO) => {
+  warehouseSelection.value = row
+}
+
+const confirmWarehouseSelection = () => {
+  if (!warehouseSelection.value) return
+  const oldWarehouseId = formData.value.warehouseId
+  selectedWarehouse.value = warehouseSelection.value
+  formData.value.warehouseId = warehouseSelection.value.id
+  if (oldWarehouseId !== formData.value.warehouseId) {
+    clearAreaSelection()
+  }
+  warehouseDialogVisible.value = false
+}
+
+const getAreaTableList = async () => {
+  areaLoading.value = true
+  try {
+    const data = await WarehouseAreaApi.getWarehouseAreaPage({
+      ...areaQueryParams,
+      warehouseId: formData.value.warehouseId
+    })
+    areaTableList.value = data?.list ?? []
+    areaTotal.value = data?.total ?? 0
+  } finally {
+    areaLoading.value = false
+  }
+}
+
+const openAreaDialog = async () => {
+  if (!formData.value.warehouseId) {
+    message.warning(t('ErpStock.Check.validatorSelectWarehouseFirst'))
+    return
+  }
+  areaDialogVisible.value = true
+  areaSelection.value = selectedArea.value
+  await getAreaTableList()
+}
+
+const handleAreaQuery = () => {
+  areaQueryParams.pageNo = 1
+  getAreaTableList()
+}
+
+const resetAreaQuery = () => {
+  areaQueryParams.pageNo = 1
+  areaQueryParams.areaCode = undefined
+  areaQueryParams.areaName = undefined
+  getAreaTableList()
+}
+
+const handleAreaRowClick = (row: WarehouseAreaVO) => {
+  areaSelection.value = row
+}
+
+const confirmAreaSelection = () => {
+  if (!areaSelection.value) return
+  selectedArea.value = areaSelection.value
+  formData.value.areaId = areaSelection.value.id
+  areaDialogVisible.value = false
+}
+
+const handleCodeAutoChange = (value: boolean) => {
+  if (value) {
+    formData.value.code = undefined
+  }
+  formRef.value?.clearValidate('code')
+}
+
+const resetForm = () => {
+  formData.value = {
+    code: undefined,
+    isCode: true,
+    palletType: undefined,
+    specification: undefined,
+    ratedLoadWeight: undefined,
+    unit: 'kg',
+    status: undefined,
+    warehouseId: undefined,
+    areaId: undefined,
+    planCode: undefined,
+    productId: undefined,
+    productCount: undefined,
+    qrcode: undefined,
+    purchaseDate: undefined,
+    useDate: undefined,
+    remark: undefined
+  }
+  specificationParts.length = undefined
+  specificationParts.width = undefined
+  specificationParts.height = undefined
+  selectedWarehouse.value = undefined
+  selectedArea.value = undefined
+  formRef.value?.resetFields()
+}
+</script>
+
+<style scoped lang="scss">
+.pallet-dialog-pagination {
+  display: flex;
+  justify-content: flex-end;
+  padding: 16px 0 8px;
+}
+
+.pallet-spec-input {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr) auto minmax(0, 1fr);
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+
+  :deep(.el-input-number) {
+    width: 100%;
+  }
+
+  span {
+    color: var(--el-text-color-secondary);
+  }
+}
+</style>
diff --git a/src/views/erp/stock/pallet/index.vue b/src/views/erp/stock/pallet/index.vue
new file mode 100644
index 00000000..23a5b232
--- /dev/null
+++ b/src/views/erp/stock/pallet/index.vue
@@ -0,0 +1,223 @@
+<template>
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
+      <el-form-item :label="t('ErpStock.Pallet.code')" prop="code">
+        <el-input v-model="queryParams.code" :placeholder="t('ErpStock.Pallet.placeholderCode')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.palletType')" prop="palletType">
+        <el-select v-model="queryParams.palletType" :placeholder="t('ErpStock.Pallet.placeholderPalletType')" clearable
+          class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.STORAGE_PALLET_TYPES)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.status')" prop="status">
+        <el-select v-model="queryParams.status" :placeholder="t('ErpStock.Pallet.placeholderStatus')" clearable
+          class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.STORAGE_PALLET_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.warehouseId')" prop="warehouseId" v-show="showAllFilters">
+        <el-select v-model="queryParams.warehouseId" :placeholder="t('ErpStock.Pallet.placeholderWarehouseId')"
+          clearable class="!w-240px" @change="handleWarehouseChange">
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.areaId')" prop="areaId" v-show="showAllFilters">
+        <el-select v-model="queryParams.areaId" :placeholder="t('ErpStock.Pallet.placeholderAreaId')" clearable
+          class="!w-240px">
+          <el-option v-for="item in filteredAreaList" :key="item.id" :label="item.areaName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Pallet.planCode')" prop="planCode" v-show="showAllFilters">
+        <el-input v-model="queryParams.planCode" :placeholder="t('ErpStock.Pallet.placeholderPlanCode')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item v-if="filterCount > 3">
+        <el-button type="text" class="text-primary" @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+            t('FactoryModeling.FactoryStructure.expandText') }}
+        </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> {{ t('common.reset') }}
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:pallet:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> {{ t('action.add') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
+      <el-table-column :label="t('ErpStock.Pallet.code')" align="center" prop="code" min-width="150" sortable />
+      <el-table-column :label="t('ErpStock.Pallet.palletType')" align="center" prop="palletType" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STORAGE_PALLET_TYPES" :value="scope.row.palletType" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Pallet.specification')" align="center" prop="specification"
+        min-width="140" />
+      <el-table-column :label="t('ErpStock.Pallet.ratedLoadWeight')" align="center" min-width="120">
+        <template #default="scope">
+          {{ formatWeight(scope.row) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Pallet.status')" align="center" prop="status" min-width="100" sortable>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STORAGE_PALLET_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Pallet.warehouseId')" align="center" prop="warehouseId" min-width="120">
+        <template #default="scope">
+          {{ getWarehouseName(scope.row.warehouseId) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Pallet.areaId')" align="center" prop="areaId" min-width="120">
+        <template #default="scope">
+          {{ getAreaName(scope.row.areaId) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Pallet.planCode')" align="center" prop="planCode" min-width="160" />
+      <el-table-column :label="t('ErpStock.Pallet.productId')" align="center" prop="productId" min-width="100" />
+      <el-table-column :label="t('ErpStock.Pallet.productCount')" align="center" prop="productCount" min-width="100" />
+
+      <el-table-column :label="t('ErpStock.Pallet.purchaseDate')" align="center" prop="purchaseDate" min-width="120" />
+      <el-table-column :label="t('ErpStock.Pallet.useDate')" align="center" prop="useDate" min-width="120" />
+      <el-table-column :label="t('ErpStock.Pallet.remark')" align="center" prop="remark" min-width="160" />
+      <el-table-column :label="t('ErpStock.Pallet.createTime')" align="center" prop="createTime"
+        :formatter="dateFormatter" width="180px" sortable />
+      <el-table-column :label="t('common.operate')" align="center" width="150px">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row)" v-hasPermi="['erp:pallet:update']">
+            {{ t('action.edit') }}
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:pallet:delete']">
+            {{ t('action.del') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <PalletForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { PalletApi, PalletVO } from '@/api/erp/stock/pallet'
+import { WarehouseApi } from '@/api/erp/stock/warehouse'
+import { WarehouseAreaApi } from '@/api/erp/stock/warehousearea'
+import PalletForm from './PalletForm.vue'
+
+defineOptions({ name: 'ErpPallet' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const loading = ref(true)
+const list = ref<PalletVO[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  palletType: undefined,
+  status: undefined,
+  warehouseId: undefined,
+  areaId: undefined,
+  planCode: undefined
+})
+const queryFormRef = ref()
+const showAllFilters = ref(false)
+const filterCount = 6
+const warehouseList = ref<any[]>([])
+const areaList = ref<any[]>([])
+
+const filteredAreaList = computed(() => {
+  if (!queryParams.warehouseId) return areaList.value
+  return areaList.value.filter((item) => item.warehouseId === queryParams.warehouseId)
+})
+
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}
+
+const getWarehouseName = (warehouseId: number) => {
+  return warehouseList.value.find((item) => item.id === warehouseId)?.name ?? '-'
+}
+
+const getAreaName = (areaId: number) => {
+  return areaList.value.find((item) => item.id === areaId)?.areaName ?? '-'
+}
+
+const formatWeight = (row: PalletVO) => {
+  if (row.ratedLoadWeight == null) return '-'
+  return row.unit ? `${row.ratedLoadWeight}${row.unit}` : row.ratedLoadWeight
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PalletApi.getPalletPage(queryParams)
+    list.value = data.list ?? []
+    total.value = data.total ?? 0
+  } finally {
+    loading.value = false
+  }
+}
+
+const getWarehouseList = async () => {
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+}
+
+const getAreaList = async () => {
+  const data = await WarehouseAreaApi.getWarehouseAreaPage({ pageNo: 1, pageSize: 100 })
+  areaList.value = data.list ?? []
+}
+
+const handleWarehouseChange = () => {
+  queryParams.areaId = undefined
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const formRef = ref()
+const openForm = (type: string, row?: PalletVO) => {
+  formRef.value.open(type, row)
+}
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await PalletApi.deletePallet(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch { }
+}
+
+onMounted(() => {
+  getWarehouseList()
+  getAreaList()
+  getList()
+})
+</script>
diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index 734b17b1..c2d877a0 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -210,7 +210,7 @@ const open = async (type: string, id?: number, taskId: number) => {
   //   },
   // ]
   // formData.value.unitId = 5
-  productList.value = await ProductApi.getMesProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList({ categoryType: 1 })
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗