diff --git a/klp-ui/src/api/wms/transferOrder.js b/klp-ui/src/api/wms/transferOrder.js
index 14078578..53c46c0d 100644
--- a/klp-ui/src/api/wms/transferOrder.js
+++ b/klp-ui/src/api/wms/transferOrder.js
@@ -42,3 +42,11 @@ export function delTransferOrder(orderId) {
     method: 'delete'
   })
 }
+
+// 审批调拨单
+export function approveTransferOrder(orderId, status) {
+  return request({
+    url: '/wms/transferOrder/approve/' + orderId + '/' + status,
+    method: 'put'
+  })
+}
diff --git a/klp-ui/src/views/crm/coil/index.vue b/klp-ui/src/views/crm/coil/index.vue
index 0f9bd997..012b5c60 100644
--- a/klp-ui/src/views/crm/coil/index.vue
+++ b/klp-ui/src/views/crm/coil/index.vue
@@ -146,7 +146,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 99,
+        pageSize: 99999,
         status: 0,
         dateType: 1,
         warehouseId: undefined,
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index cdd47c42..58e49af7 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -509,6 +509,8 @@ export default {
         if (this.selectedPlan.planName) {
           this.form.waybillName = `发货单_${this.selectedPlan.planName}`;
         }
+        // deliveryTime设置为当前时间，格式为yyyy-MM-dd HH:mm:ss，北京时间，
+        this.form.deliveryTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
       }
       this.open = true;
       this.title = "添加发货单";
diff --git a/klp-ui/src/views/wms/move/batch.vue b/klp-ui/src/views/wms/move/batch.vue
index dcba5885..55ea936e 100644
--- a/klp-ui/src/views/wms/move/batch.vue
+++ b/klp-ui/src/views/wms/move/batch.vue
@@ -25,6 +25,18 @@
           placeholder="请选择实际调拨时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="调拨类型" prop="transferType">
+        <dict-select v-model="queryParams.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+        </dict-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="approveStatus">
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
+          <el-option label="未申请" :value="'0'" />
+          <el-option label="待审批" :value="'1'" />
+          <el-option label="已通过" :value="'2'" />
+          <el-option label="已驳回" :value="'3'" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -83,6 +95,21 @@
           <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="调拨类型" align="center" prop="transferType" width="120"></el-table-column>
+       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
+        <template slot-scope="scope">
+          <el-tag :type="getapproveStatusType(scope.row.approveStatus)">
+            {{ getapproveStatusText(scope.row.approveStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批人" align="center" prop="approver" />
+     
+      <el-table-column label="审批时间" align="center" prop="approveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.approveTime ? parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -97,13 +124,55 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            :disabled="!canEdit(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            :disabled="!canDelete(scope.row)"
           >删除</el-button>
+          <el-button
+            size="mini"
+            plain
+            type="text"
+            @click="handleSubmitapprove(scope.row)"
+            v-if="(scope.row.approveStatus || '0') == '0'"
+            icon="el-icon-check"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            plain
+            type="text"
+            @click="handleWithdrawapprove(scope.row)"
+            v-if="scope.row.approveStatus == '1'"
+            icon="el-icon-refresh"
+          >撤回</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            plain
+            @click="handleReSubmit(scope.row)"
+            v-if="scope.row.approveStatus == '3' || scope.row.approveStatus == '2'"
+            icon="el-icon-refresh"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['coil:move:approval']"
+            @click="handleResolve(scope.row)"
+            icon="el-icon-check"
+            v-if="scope.row.approveStatus == '1'"
+          >通过</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['coil:move:approval']"
+            @click="handleReject(scope.row)"
+            v-if="scope.row.approveStatus == '1'"
+            icon="el-icon-close"
+          >驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -133,6 +202,10 @@
             placeholder="请选择调拨时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="调拨类型" prop="transferType">
+          <dict-select v-model="form.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+          </dict-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -147,15 +220,16 @@
       <div style="margin-bottom: 10px; display: flex; align-items: center;">
         <el-button icon="el-icon-download" type="warning" plain @click="handleExportDetail">导出</el-button>
         <el-button style="margin-right: 10px;" icon="el-icon-refresh" type="success" plain @click="handleRefreshDetailList">刷新</el-button>
-        <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange"></coil-selector>
+        <el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button>
+        <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
       </div>
-      <transfer-item-table :data="transferOrderItems" @refreshData="getDetailList" />
+      <transfer-item-table ref="transferItemTable" :data="transferOrderItems" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder } from "@/api/wms/transferOrder";
+import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder, approveTransferOrder } from "@/api/wms/transferOrder";
 import { listTransferOrderItem, batchAddTransferOrderItem } from "@/api/wms/transferOrderItem";
 import CoilSelector from "@/components/CoilSelector";
 import TransferItemTable from "@/views/wms/move/components/tranferItemTable.vue";
@@ -196,6 +270,7 @@ export default {
         transferName: undefined,
         transferStatus: undefined,
         transferTime: undefined,
+        approveStatus: undefined,
       },
       // 表单参数
       form: {},
@@ -220,6 +295,10 @@ export default {
       // 调拨单明细表格数据
       transferOrderItems: [],
       currentOrderId: undefined,
+      // 是否可以添加钢卷
+      canAddCoils: false,
+      // 当前审批状态
+      currentOrderStatus: undefined,
     };
   },
   created() {
@@ -235,6 +314,124 @@ export default {
         this.loading = false;
       });
     },
+    handleResolve(row) {
+      approveTransferOrder(row.orderId, '2').then(response => {
+        this.$modal.msgSuccess('审批成功');
+        this.getList();
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleReject(row) {
+      approveTransferOrder(row.orderId, '3').then(response => {
+        this.$modal.msgSuccess('审批成功');
+        this.getList();
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 获取审批状态文本 */
+    getapproveStatusText(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return '未申请';
+      }
+      const statusMap = {
+        '0': '未申请',
+        '1': '待审批',
+        '2': '已通过',
+        '3': '已驳回'
+      };
+      return statusMap[status] || '未申请';
+    },
+    /** 获取审批状态标签类型 */
+    getapproveStatusType(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return 'info';
+      }
+      const typeMap = {
+        '0': 'info',
+        '1': 'warning',
+        '2': 'success',
+        '3': 'danger'
+      };
+      return typeMap[status] || 'info';
+    },
+    /** 判断是否可以编辑 */
+    canEdit(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0' || status === '1' || status === '3';
+    },
+    /** 判断是否可以删除 */
+    canDelete(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0';
+    },
+    /** 提交审批 */
+    handleSubmitapprove(row) {
+      this.$confirm('确定要提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '1',
+        }).then(response => {
+          this.$modal.msgSuccess('提交审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 撤回审批 */
+    handleWithdrawapprove(row) {
+      this.$confirm('确定要撤回审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '0',
+        }).then(response => {
+          this.$modal.msgSuccess('撤回审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 重新提交 */
+    handleReSubmit(row) {
+      this.$confirm('确定要重新提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'info'
+      }).then(() => {
+        this.loading = true;
+        // 这里需要调用重新提交的API
+        // 假设API为reSubmitapprove
+        // reSubmitapprove(row.orderId).then(response => {
+        //   this.$modal.msgSuccess('重新提交成功');
+        //   this.getList();
+        // }).finally(() => {
+        //   this.loading = false;
+        // });
+        // 模拟API调用
+        setTimeout(() => {
+          this.loading = false;
+          this.$modal.msgSuccess('重新提交成功');
+          this.getList();
+        }, 1000);
+      });
+    },
     /** 刷新调拨单明细列表 */
     handleRefreshDetailList() {
       this.getDetailList();
@@ -354,24 +551,27 @@ export default {
       this.reset();
     },
     // 表单重置
-    reset() {
-      this.form = {
-        orderId: undefined,
-        transferNo: undefined,
-        transferName: undefined,
-        transferStatus: undefined,
-        transferTime: undefined,
-        remark: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        updateBy: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
+      reset() {
+        this.form = {
+          orderId: undefined,
+          transferNo: undefined,
+          transferName: undefined,
+          transferStatus: undefined,
+          transferTime: undefined,
+          remark: undefined,
+          delFlag: undefined,
+          createBy: undefined,
+          updateBy: undefined,
+          createTime: undefined,
+          updateTime: undefined,
+          approveStatus: '0',
+          approver: undefined,
+          approveTime: undefined
+        };
+        this.resetForm("form");
+      },
     getDetailList() {
-      this.handleView({ orderId: this.currentOrderId });
+      this.handleView({ orderId: this.currentOrderId, approveStatus: this.currentOrderStatus });
     },
     /** 查看按钮操作 */
     handleView(row) {
@@ -379,6 +579,10 @@ export default {
       this.detailLoading = true;
       this.detailOpen = true;
       this.currentOrderId = row.orderId;
+      // 根据审批状态设置是否可以添加钢卷，如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      this.currentOrderStatus = status;
+      this.canAddCoils = status === '0';
       listTransferOrderItem({ transferId: row.orderId }).then(response => {
         console.log(response.rows);
         this.transferOrderItems = response.rows;
@@ -483,6 +687,15 @@ export default {
       this.download('wms/transferOrder/export', {
         ...this.queryParams
       }, `transferOrder_${new Date().getTime()}.xlsx`)
+    },
+    /** 执行全部调拨 */
+    handleConfirmAll() {
+      if (this.$refs.transferItemTable) {
+        this.buttonLoading = true;
+        this.$refs.transferItemTable.handleConfirmAll().finally(() => {
+          this.buttonLoading = false;
+        });
+      }
     }
   }
 };
diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
index 3eaf805a..1d326e9f 100644
--- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue
+++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-table :data="tableData" style="width: 100%" border>
+  <el-table :data="tableData" style="width: 100%" border v-loading="confirmLoading">
     <el-table-column prop="coilId" label="钢卷号">
       <template slot-scope="scope">
         <CoilNo :coil-no="scope.row.coil.enterCoilNo" :coil="scope.row.coil" />
@@ -25,19 +25,19 @@
 
     <el-table-column prop="materialTypeAfter" label="调拨后类型" width="100">
       <template slot-scope="scope">
-        <el-select v-if="!scope.row.isConfirmed" v-model="scope.row.materialTypeAfter"
+        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.materialTypeAfter"
           @change="handleMaterialChange(scope.row)" placeholder="请选择">
           <el-option label="原料" :value="1" />
           <el-option label="产品" :value="2" />
         </el-select>
-        <div v-else slot-scope="scope">
+        <div v-else>
           {{ scope.row.materialTypeAfter == '1' ? '原料' : '产品' }}
         </div>
       </template>
     </el-table-column>
     <el-table-column prop="itemIdAfter" v-loading="materialLoading" label="调拨后物料" width="260">
       <template slot-scope="scope">
-        <div v-loading="materialLoading" v-if="!scope.row.isConfirmed">
+        <div v-loading="materialLoading" v-if="!scope.row.isConfirmed && canEdit">
           <RawMaterialSelect v-model="scope.row.itemIdAfter" v-if="scope.row.materialTypeAfter == '1'" />
           <ProductSelect v-model="scope.row.itemIdAfter" v-else-if="scope.row.materialTypeAfter == '2'" />
         </div>
@@ -49,7 +49,7 @@
     </el-table-column>
     <el-table-column prop="warehouseIdAfter" label="调拨后库区" width="200">
       <template slot-scope="scope">
-        <el-select v-if="!scope.row.isConfirmed" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
+        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
           <el-option v-for="item in warehouseList" :disabled="!item.isEnabled" :key="item.warehouseId"
             :label="item.warehouseName" :value="item.warehouseId" />
         </el-select>
@@ -61,17 +61,25 @@
 
     <el-table-column type="action" label="操作" width="180">
       <template slot-scope="scope">
-        <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
-          :loading="buttonLoading">确认</el-button>
-        <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
-          :loading="buttonLoading">取消</el-button>
+        <div v-if="orderStatus == 0">
+          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
+            :loading="buttonLoading">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+            :loading="buttonLoading">删除</el-button>
+        </div>
+        <div v-else>
+          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
+            :loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button>
+          <!-- <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+            :loading="buttonLoading" :disabled="orderStatus !== '2'">取消</el-button> -->
+        </div>
       </template>
     </el-table-column>
   </el-table>
 </template>
 
 <script>
-import { matchOrCreateMaterial, confirmTransferOrderItem, cancelTransferOrderItem } from '@/api/wms/transferOrderItem'
+import { matchOrCreateMaterial, confirmTransferOrderItem, cancelTransferOrderItem, updateTransferOrderItem } from '@/api/wms/transferOrderItem'
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import { listWarehouse } from '@/api/wms/warehouse';
@@ -84,6 +92,14 @@ export default {
     data: {
       type: Array,
       default: () => []
+    },
+    canEdit: {
+      type: Boolean,
+      default: false
+    },
+    orderStatus: {
+      type: String,
+      default: ''
     }
   },
   components: {
@@ -99,7 +115,8 @@ export default {
       tableData: [],
       materialLoading: false,
       warehouseList: [],
-      buttonLoading: false
+      buttonLoading: false,
+      confirmLoading: false,
     }
   },
   mounted() {
@@ -111,8 +128,8 @@ export default {
         if (newVal !== oldVal) {
           // 预处理数据
           this.tableData = newVal.map(item => {
-            const isConfirmed = this.isConfirmed(item);
-            if (isConfirmed) {
+            const isEmpty = this.isEmpty(item);
+            if (isEmpty) {
               return {
                 ...item,
                 oBefore: {
@@ -131,7 +148,7 @@ export default {
                   surfaceTreatmentDesc: item.surfaceTreatmentAfter,
                   zincLayer: item.zincLayerAfter
                 },
-                isConfirmed: true
+                isConfirmed: this.isConfirmed(item)
               }
             } else {
               return {
@@ -148,7 +165,7 @@ export default {
                 itemIdAfter: item.itemIdBefore,
                 warehouseIdAfter: item.warehouseIdBefore,
                 materialTypeAfter: item.materialTypeBefore,
-                isConfirmed: false
+                isConfirmed: this.isConfirmed(item)
               }
             }
           });
@@ -167,8 +184,23 @@ export default {
     // 是否是已调拨状态
     isConfirmed(item) {
       // 只有三个after字段有值，才认为是已调拨状态
+      // return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
+      return item.isTransferred == 1
+    },
+    // isEmpty 是否为空
+    isEmpty(item) {
       return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
     },
+    handleUpdate(row) {
+      updateTransferOrderItem(row).then(res => {
+        this.$message({
+          message: '保存成功',
+          type: 'success'
+        })
+        // 刷新数据
+        this.$emit('refreshData')
+      })
+    },
     // 确认调拨
     handleConfirm(item) {
       this.buttonLoading = true
@@ -185,6 +217,35 @@ export default {
         this.buttonLoading = false
       })
     },
+    handleConfirmAll() {
+      const unconfirmedItems = this.tableData.filter(item => !item.isConfirmed && !item.isTransferred);
+      if (unconfirmedItems.length === 0) {
+        this.$message({ message: '没有可执行的调拨项', type: 'info' });
+        return;
+      }
+      
+      this.buttonLoading = true;
+      const promises = unconfirmedItems.map(item => confirmTransferOrderItem(item));
+      this.confirmLoading = true;
+      return Promise.all(promises).then(results => {
+        const successCount = results.filter(res => res.code === 200).length;
+        if (successCount > 0) {
+          this.$message({
+            message: `成功执行 ${successCount} 项调拨`,
+            type: 'success'
+          });
+          this.$emit('refreshData');
+        }
+      }).catch(error => {
+        this.$message({
+          message: '执行调拨时发生错误',
+          type: 'error'
+        });
+      }).finally(() => {
+        this.buttonLoading = false;
+        this.confirmLoading = false;
+      });
+    },
     // 取消调拨
     handleCancel(item) {
       this.$confirm('确认取消调拨吗？', '提示', {
diff --git a/klp-ui/src/views/wms/move/correct.vue b/klp-ui/src/views/wms/move/correct.vue
deleted file mode 100644
index 745dc45b..00000000
--- a/klp-ui/src/views/wms/move/correct.vue
+++ /dev/null
@@ -1,1359 +0,0 @@
-<template>
-  <div class="app-container acid-do-container">
-    <el-row :gutter="20">
-      <!-- 左侧：物料列表 -->
-      <el-col :span="24">
-        <div class="section-card material-section">
-          <div class="section-header">
-            <h3 class="section-title">
-              调拨钢卷
-              <span class="section-desc">绿色边框表示当前钢卷，灰色边框表示历史钢卷, 蓝色边框表示已发货钢卷</span>
-            </h3>
-
-            <el-button size="mini" icon="el-icon-refresh" @click="getMaterialCoil">刷新</el-button>
-          </div>
-
-          <!-- 搜索栏 -->
-          <el-form :model="materialQueryParams" ref="materialQueryForm" size="small" :inline="true" class="query-form">
-            <el-form-item label="钢卷类型" prop="dataType">
-              <el-select v-model="coilType" placeholder="请选择钢卷类型">
-                <el-option label="全部" value="all" />
-                <el-option label="当前钢卷" value="now" />
-                <el-option label="历史钢卷" value="history" />
-                <el-option label="已发货钢卷" value="trans" />
-                <el-option label="未入库钢卷" value="unIn" />
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="入场钢卷号" prop="enterCoilNo">
-              <el-input v-model="materialQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
-                @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
-            </el-form-item>
-            <el-form-item label="当前钢卷号" prop="currentCoilNo">
-              <el-input v-model="materialQueryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
-                @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
-            </el-form-item>
-            <el-form-item label="逻辑库区" prop="warehouseId">
-              <warehouse-select v-model="materialQueryParams.warehouseId" placeholder="请选择逻辑库区" clearable
-                @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterialQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetMaterialQuery">重置</el-button>
-              <el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-            </el-form-item>
-          </el-form>
-
-          <!-- 物料卡片列表 -->
-          <div v-loading="materialLoading" class="card-grid-container">
-            <div v-if="materialCoilList.length === 0" class="empty-state">
-              <i class="el-icon-box"></i>
-              <p>暂无待领物料</p>
-            </div>
-            <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card"
-              :style="getBorderStyle(item)">
-              <div class="card-header">
-                <div class="header-left">
-                  <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
-                  <el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
-                    getTypeLabel(item) }}</el-tag>
-                  <span class="material-type">{{ item.materialType || '原料' }}</span>
-                  <el-popover placement="top" width="280" trigger="hover" popper-class="material-params-popover">
-                    <div class="material-params-content">
-                      <div class="params-title">
-                        {{ item.itemName || '—' }}
-                      </div>
-                      <div class="params-list">
-                        <div class="param-item">
-                          <div class="param-row" v-if="item.specification">
-                            <span class="param-label">规格：</span>
-                            <span class="param-value">{{ item.specification }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.material">
-                            <span class="param-label">材质：</span>
-                            <span class="param-value">{{ item.material }}</span>
-                          </div>
-
-                          <div class="param-row" v-if="item.surfaceTreatmentDesc">
-                            <span class="param-label">表面处理：</span>
-                            <span class="param-value">{{ item.surfaceTreatmentDesc }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.zincLayer">
-                            <span class="param-label">镀层质量：</span>
-                            <span class="param-value">{{ item.zincLayer }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.manufacturer">
-                            <span class="param-label">厂家：</span>
-                            <span class="param-value">{{ item.manufacturer }}</span>
-                          </div>
-                        </div>
-                        <div class="param-divider"></div>
-                        <div class="param-item">
-                          <div class="param-row" v-if="item.qualityStatus">
-                            <span class="param-label">质量状态：</span>
-                            <span class="param-value">{{ item.qualityStatus }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.trimmingRequirement">
-                            <span class="param-label">切边要求：</span>
-                            <span class="param-value">{{ item.trimmingRequirement }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.packingStatus">
-                            <span class="param-label">原料材质：</span>
-                            <span class="param-value">{{ item.packingStatus }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.packagingRequirement">
-                            <span class="param-label">包装要求：</span>
-                            <span class="param-value">{{ item.packagingRequirement }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.grossWeight">
-                            <span class="param-label">毛重：</span>
-                            <span class="param-value">{{ item.grossWeight }}t</span>
-                          </div>
-                          <div class="param-row" v-if="item.netWeight">
-                            <span class="param-label">净重：</span>
-                            <span class="param-value">{{ item.netWeight }}t</span>
-                          </div>
-                          <div class="param-row" v-if="item.length">
-                            <span class="param-label">长度：</span>
-                            <span class="param-value">{{ item.length }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.actualLength">
-                            <span class="param-label">实测长度：</span>
-                            <span class="param-value">{{ item.actualLength }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.actualThickness">
-                            <span class="param-label">实测厚度：</span>
-                            <span class="param-value">{{ item.actualThickness }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.actualWidth">
-                            <span class="param-label">实测宽度：</span>
-                            <span class="param-value">{{ item.actualWidth }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.temperGrade">
-                            <span class="param-label">调制度：</span>
-                            <span class="param-value">{{ item.temperGrade }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.coatingType">
-                            <span class="param-label">镀层种类：</span>
-                            <span class="param-value">{{ item.coatingType }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.team">
-                            <span class="param-label">班组：</span>
-                            <span class="param-value">{{ item.team }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.updateTime">
-                            <span class="param-label">更新时间：</span>
-                            <span class="param-value">{{ parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.updateBy">
-                            <span class="param-label">更新人：</span>
-                            <span class="param-value">{{ item.updateBy }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.remark">
-                            <span class="param-label">备注：</span>
-                            <span class="param-value">{{ item.remark }}</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <i slot="reference" class="el-icon-setting param-icon"></i>
-                  </el-popover>
-
-                  <i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
-
-                  <i class="el-icon-time param-icon" @click="handleTrace(item)" title="追溯"></i>
-                </div>
-              </div>
-
-              <div class="card-body" style="position: relative;">
-                <div class="info-list">
-                  <div class="info-item">
-                    <span class="info-label">入场：</span>
-                    <span class="info-value" :title="item.enterCoilNo">{{ item.enterCoilNo || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">厂家：</span>
-                    <span class="info-value" :title="item.supplierCoilNo">{{ item.supplierCoilNo || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">库位：</span>
-                    <span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">库区：</span>
-                    <span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—'
-                    }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">重量：</span>
-                    <span class="info-value">{{ item.netWeight || '—' }}t</span>
-                  </div>
-                </div>
-                <el-button v-if="item.dataType == 1 && item.status == 0"
-                  style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
-                  size="mini" @click="handleRestoreMaterial(item)" :loading="item.cancelling"
-                  class="action-btn">回滚</el-button>
-                <el-button v-if="item.dataType == 10 && item.status == 0"
-                  style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
-                  size="mini" @click="handleForceInMaterial(item)" :loading="item.cancelling"
-                  class="action-btn">强制入库</el-button>
-              </div>
-
-              <div class="card-footer">
-                <el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
-                  :loading="item.picking" class="action-btn">调拨</el-button>
-                <el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
-                  :loading="item.picking" class="action-btn">删除</el-button>
-                <el-button type="warning" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
-                  @click="handleAddAbnormal(item)" :loading="item.cancelling" class="action-btn">
-                  异常
-                  <span v-if="item.abnormalCount > 0">({{ item.abnormalCount }})</span>
-                </el-button>
-              </div>
-            </div>
-          </div>
-
-          <!-- 分页 -->
-          <pagination v-show="materialTotal > 0" :total="materialTotal" :page.sync="materialQueryParams.pageNum"
-            :limit.sync="materialQueryParams.pageSize" @pagination="getMaterialCoil" />
-        </div>
-      </el-col>
-    </el-row>
-
-    <el-dialog title="新增异常" :visible.sync="exceptionDialogVisible" width="600px">
-      <el-form ref="exceptionForm" :model="exceptionForm" label-width="80px">
-        <el-form-item label="位置" prop="position">
-          <el-radio-group v-model="exceptionForm.position">
-            <el-radio-button v-for="dict in dict.type.coil_abnormal_position" :key="dict.value" :label="dict.value">{{
-              dict.label }}</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="长度坐标" prop="lengthCoord">
-          <el-input v-model="exceptionForm.lengthCoord" placeholder="请输入长度坐标" />
-        </el-form-item>
-        <el-form-item label="缺陷代码" prop="defectCode">
-          <el-radio-group v-model="exceptionForm.defectCode">
-            <el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{
-              dict.label }}</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="程度" prop="degree">
-          <el-radio-group v-model="exceptionForm.degree">
-            <el-radio-button v-for="dict in dict.type.coil_abnormal_degree" :key="dict.value" :label="dict.value">{{
-              dict.label }}</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" v-model="exceptionForm.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="info" @click="handleAbnormal">查看异常</el-button>
-        <el-button :loading="buttonLoading" type="primary" @click="confirmException">确 定</el-button>
-        <el-button @click="cancelException">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 标签预览弹窗 -->
-    <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
-      <label-render :content="labelRender.data" :labelType="labelRender.type" />
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="correctVisible" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="入场钢卷号" prop="enterCoilNo">
-          <el-input v-model="form.enterCoilNo" placeholder="请输入入场钢卷号" :disabled="form.coilId" />
-        </el-form-item>
-        <el-form-item label="当前钢卷号" prop="currentCoilNo" >
-          <el-input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" disabled />
-        </el-form-item>
-        <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
-          <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" disabled/>
-        </el-form-item>
-        
-        <!-- <el-form-item label="实际库区" prop="actualWarehouseId">
-          <actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;"
-            clearable />
-        </el-form-item> -->
-        <el-form-item label="班组" prop="team">
-          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" disabled>
-            <el-option key="甲" label="甲" value="甲" />
-            <el-option key="乙" label="乙" value="乙" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所在库位" prop="warehouseId">
-          <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
-        </el-form-item>
-        <el-form-item label="材料类型" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
-            <el-option label="成品" value="成品" />
-            <el-option label="原料" value="原料" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="getItemLabel" prop="itemId" v-loading="itemIdLoading">
-          <product-select v-if="form.itemType == 'product'" v-model="form.itemId" placeholder="请选择成品"
-            style="width: 100%;" clearable />
-          <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" placeholder="请选择原料"
-            style="width: 100%;" clearable />
-          <div v-else>请先选择材料类型</div>
-        </el-form-item>
-        <el-form-item label="质量状态" prop="qualityStatus" disabled>
-          <el-select disabled v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
-            <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
-              :value="item.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="切边要求" prop="trimmingRequirement" disabled>
-          <el-select disabled v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
-            <el-option label="净边料" value="净边料" />
-            <el-option label="毛边料" value="毛边料" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="原料材质" prop="packingStatus" disabled>
-          <el-input disabled v-model="form.packingStatus" placeholder="请输入原料材质">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="包装要求" prop="packagingRequirement" disabled>
-          <el-select disabled v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%">
-            <el-option label="裸包" value="裸包" />
-            <el-option label="普包" value="普包" />
-            <el-option label="简包" value="简包" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="毛重" prop="grossWeight" disabled>
-          <el-input disabled v-model="form.grossWeight" placeholder="请输入毛重" />
-        </el-form-item>
-        <el-form-item label="净重" prop="netWeight" disabled>
-          <el-input disabled v-model="form.netWeight" placeholder="请输入净重" />
-        </el-form-item>
-        <el-form-item label="长度" prop="length" disabled>
-          <el-input disabled v-model="form.length" placeholder="请输入长度" />
-        </el-form-item>
-        <el-form-item label="实测长度(m)" prop="actualLength" disabled>
-          <el-input-number disabled :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
-            :step="0.01" />
-        </el-form-item>
-        <el-form-item label="实测宽度(m)" prop="actualWidth" disabled>
-          <el-input-number disabled :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
-            :step="0.01" />
-        </el-form-item>
-        <el-form-item label="调制度" prop="temperGrade" disabled>
-          <el-input disabled v-model="form.temperGrade" placeholder="请输入调制度" />
-        </el-form-item>
-        <el-form-item label="镀层种类" prop="coatingType" disabled>
-          <MemoInput disabled storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark" disabled>
-          <el-input disabled v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime" v-if="form.coilId" disabled>
-          <el-date-picker disabled v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择创建时间" style="width: 100%;" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createBy" v-if="form.coilId" disabled>
-          <el-select disabled v-model="form.createBy" placeholder="请选择创建人" style="width: 100%;" clearable filterable>
-            <el-option v-for="item in userList" :key="item.userName" :label="item.nickName" :value="item.userName" />
-          </el-select>
-          <!-- <el-input v-model="form.createBy" placeholder="请输入创建人" /> -->
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 钢卷追溯对话框（使用封装的组件） -->
-    <el-dialog title="钢卷追溯" :visible.sync="traceOpen" width="90%" append-to-body>
-      <coil-trace-result v-loading="traceLoading" :trace-result="traceResult"></coil-trace-result>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listMaterialCoil, getMaterialCoilTrace, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil, restoreMaterialCoil, addMaterialCoil } from '@/api/wms/coil'
-import { listUser } from '@/api/system/user'
-import { listPendingAction, startProcess, cancelAction, delPendingAction } from '@/api/wms/pendingAction'
-import { parseTime } from '@/utils/klp'
-import ProductInfo from '@/components/KLPService/Renderer/ProductInfo'
-import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo'
-import { addCoilAbnormal } from '@/api/wms/coilAbnormal'
-import LabelRender from "@/views/wms/coil/panels/LabelRender/index.vue"
-import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
-import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
-import ProductSelect from "@/components/KLPService/ProductSelect";
-import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
-import CoilTraceResult from "@/views/wms/coil/panels/CoilTraceResult.vue";
-import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
-import { matchOrCreateMaterial, addTransferOrderItem } from '@/api/wms/transferOrderItem'
-
-export default {
-  name: 'DoPage',
-  dicts: ['action_type', 'coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree', 'coil_quality_status'],
-  props: {
-    label: {
-      type: String,
-      default: () => '酸连轧工序'
-    },
-    tabs: {
-      type: Array,
-      default: () => []
-    }
-  },
-  components: {
-    ProductInfo,
-    RawMaterialInfo,
-    LabelRender,
-    WarehouseSelect,
-    ActualWarehouseSelect,
-    ProductSelect,
-    RawMaterialSelect,
-    CoilTraceResult,
-  },
-  data() {
-    return {
-      traceOpen: false,
-      traceLoading: false,
-      traceResult: null,
-
-      coilType: 'now',
-      title: '钢卷调拨',
-      // 物料列表相关
-      materialLoading: false,
-      materialCoilList: [],
-      materialTotal: 0,
-      currentTab: '',
-      materialQueryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        enterCoilNo: null,
-        currentCoilNo: null,
-        warehouseId: null,
-      },
-      labelRender: {
-        visible: false,
-        data: {},
-        type: '2'
-      },
-
-      // 待操作列表相关
-      actionLoading: false,
-      pendingActionList: [],
-      actionTotal: 0,
-      actionQueryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        currentCoilNo: null,
-        actionType: null, // 将在created中设置为酸连轧工序的actionType
-        actionStatus: null
-      },
-
-      exceptionDialogVisible: false,
-      exceptionForm: {
-        coilId: null,
-        position: null,
-        lengthCoord: null,
-        defectCode: null,
-        degree: null,
-        remark: null
-      },
-      // 表单校验
-      rules: {
-        planId: [
-          { required: true, message: "请选择收货计划", trigger: "change" }
-        ],
-        enterCoilNo: [
-          { required: true, message: "入场钢卷号不能为空", trigger: "blur" },
-          {
-            validator: (rule, value, callback) => {
-              if (this.form.coilId) {
-                // 新增时触发校验 
-                console.log('新增时触发校验');
-                callback();
-              } else {
-                checkCoilNo({ enterCoilNo: value }).then(res => {
-                  const { duplicateType } = res.data;
-                  if (duplicateType === 'enter' || duplicateType === 'both') {
-                    // alert('入场钢卷号重复，请重新输入');
-                    callback(new Error('入场钢卷号重复，请重新输入'));
-                  } else {
-                    callback();
-                  }
-                })
-              }
-            }, trigger: 'blur'
-          },
-        ],
-        currentCoilNo: [
-          { required: true, message: "当前钢卷号不能为空", trigger: "blur" },
-        ],
-        materialType: [
-          { required: true, message: "材料类型不能为空", trigger: "change" }
-        ],
-        itemId: [
-          { required: true, message: "物品ID不能为空", trigger: "blur" }
-        ],
-        itemType: [
-          { required: true, message: "物品类型不能为空", trigger: "change" }
-        ],
-        // 净重和毛重
-        netWeight: [
-          { required: true, message: "净重不能为空", trigger: "blur" }
-        ],
-        grossWeight: [
-          { required: true, message: "毛重不能为空", trigger: "blur" }
-        ],
-      },
-      form: {},
-      correctVisible: false,
-      buttonLoading: false,
-      userList: [],
-      itemIdLoading: false,
-      originCoil: {}
-    }
-  },
-  computed: {
-    // 获取酸连轧工序的actionType值
-    acidRollingActionType() {
-      if (!this.dict.type.action_type) return null
-      const acidAction = this.dict.type.action_type.find(item => {
-        const label = item.label || ''
-        return label.includes(this.label)
-      })
-      return acidAction ? parseInt(acidAction.value) : null
-    },
-    // 动态显示标签
-    getItemLabel() {
-      if (this.form.materialType === '成品') {
-        return '产品类型';
-      } else if (this.form.materialType === '原料') {
-        return '原料类型';
-      }
-      return '物品类型';
-    },
-  },
-  watch: {
-    // 监听字典数据加载，当acidRollingActionType有值时自动加载待操作列表
-    acidRollingActionType(newVal) {
-      if (newVal && !this.actionQueryParams.actionType) {
-        this.actionQueryParams.actionType = newVal
-        // 如果待操作列表为空，则加载数据
-        if (this.pendingActionList.length === 0) {
-          this.getPendingAction()
-        }
-      }
-    },
-  },
-  created() {
-    // 加载用户列表
-    this.getUsers()
-  },
-  mounted() {
-    this.getMaterialCoil()
-  },
-  methods: {
-    parseTime,
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.correctVisible = true;
-      this.title = "添加钢卷物料";
-    },
-    /** 追溯按钮操作 */
-    handleTrace(row) {
-      this.traceOpen = true;
-      this.traceLoading = true;
-      this.traceResult = null; // 清空历史数据
-      getMaterialCoilTrace({
-        coilId: row.coilId,
-        currentCoilNo: row.currentCoilNo,
-      }).then(res => {
-        this.traceResult = res.data; // 将结果传递给组件
-      }).catch(err => {
-        console.error('溯源查询失败：', err);
-        this.$message.error('溯源查询失败，请重试');
-      }).finally(() => {
-        this.traceLoading = false;
-      });
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        coilId: undefined,
-        enterCoilNo: undefined,
-        currentCoilNo: undefined,
-        supplierCoilNo: undefined,
-        dataType: 1,
-        warehouseId: undefined,
-        nextWarehouseId: undefined,
-        qrcodeRecordId: undefined,
-        actualWarehouseId: undefined,
-        team: undefined,
-        hasMergeSplit: undefined,
-        parentCoilNos: undefined,
-        itemId: undefined,
-        itemType: undefined,
-        status: undefined,
-        remark: undefined,
-        delFlag: undefined,
-        createTime: undefined,
-        createBy: undefined,
-        updateTime: undefined,
-        updateBy: undefined,
-        materialType: '原料',
-        temperGrade: undefined,
-        coatingType: undefined,
-        actualLength: undefined,
-        actualWidth: undefined,
-      };
-      this.resetForm("form");
-    },
-    getBorderStyle(row) {
-      // console.log(row);
-      // 已发货
-      if (row.status == 1) {
-        return { border: '1.5px solid #007bff' }
-      }
-      // 历史钢卷
-      if (row.dataType == 0 || row.dataType == 2) {
-        return { border: '1.5px solid #6c757d' }
-      }
-      // 当前钢卷
-      if (row.dataType == 1) {
-        return { border: '1.5px solid #28a745' }
-      }
-      // 还未入库的钢卷
-      if (row.dataType == 10) {
-        return { border: '1.5px solid #ffc107' }
-      }
-      return { border: '1.5px solid #e4e7ed' }
-    },
-    getTypeLabel(row) {
-      if (row.status == 1) {
-        return '已发货'
-      }
-      if (row.dataType == 0 || row.dataType == 2) {
-        return '历史钢卷'
-      }
-      if (row.dataType == 1) {
-        return '当前钢卷'
-      }
-      if (row.dataType == 10) {
-        return '未入库'
-      }
-      return '未知'
-    },
-    /** 查询用户列表 */
-    getUsers() {
-      listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
-        this.userList = response.rows || []
-      })
-    },
-    // 处理材料类型变化
-    handleMaterialTypeChange(value) {
-      // 清空物品选择
-      // this.form.itemId = null;
-      this.itemIdLoading = true;
-      matchOrCreateMaterial({
-        itemId: this.form.itemId,
-        // 这里需要传的是修改前的类型
-        itemType: value === '成品' ? 'raw_material' : 'product',
-      }).then(res => {
-        console.log(res)
-        if (res.data) {
-          this.form.itemId = res.data
-        }
-      }).finally(() => {
-        this.itemIdLoading = false;
-      })
-      
-      // 根据材料类型设置物品类型
-      if (value === '成品') {
-        this.form.itemType = 'product';
-      } else if (value === '原料') {
-        this.form.itemType = 'raw_material';
-      }
-    },
-    /** 预览标签 */
-    handlePreviewLabel(row) {
-      this.labelRender.visible = true;
-      const type = getCoilTagPrintType(row);
-      this.labelRender.type = type;
-      this.labelRender.data = {
-        ...row,
-        updateTime: row.updateTime?.split(' ')[0] || '',
-      };
-    },
-    // ========== 物料列表相关方法 ==========
-    /** 查询物料列表 */
-    handleRestoreMaterial(row) {
-      this.$modal.confirm('是否要将改钢卷还原到上次加工的状态（会删除该钢卷并将上一步的历史钢卷还原）').then(_ => {
-        const loading = this.$loading({
-          lock: true,
-          text: '处理中...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        restoreMaterialCoil(row.coilId).then(_ => {
-          this.$modal.msgSuccess("还原成功");
-          this.getMaterialCoil();
-        }).finally(() => {
-          loading.close()
-        })
-      })
-    },
-    handleForceInMaterial(row) {
-      this.$modal.confirm('是否要强制入库改钢卷？').then(_ => {
-        const loading = this.$loading({
-          lock: true,
-          text: '处理中...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        updateMaterialCoilSimple({
-          ...row,
-          dataType: 1,
-        }).then(_ => {
-          this.$modal.msgSuccess("强制入库成功");
-          this.getMaterialCoil();
-        }).finally(() => {
-          loading.close()
-        })
-      })
-    },
-    getMaterialCoil() {
-      this.materialLoading = true
-      const payload = { ...this.materialQueryParams }
-      if (this.coilType == 'now') {
-        payload.dataType = 1;
-        payload.status = 0;
-      } else if (this.coilType == 'history') {
-        payload.dataType = 0;
-      } else if (this.coilType == 'trans') {
-        payload.status = 1;
-      } else if (this.coilType == 'unIn') {
-        payload.dataType = 10;
-      }
-      listMaterialCoil(payload).then(response => {
-        this.materialCoilList = response.rows || []
-        this.materialTotal = response.total || 0
-        this.materialLoading = false
-      }).catch(() => {
-        this.materialLoading = false
-      })
-    },
-    /** 物料搜索 */
-    handleMaterialQuery() {
-      this.materialQueryParams.pageNum = 1
-      this.getMaterialCoil()
-    },
-    /** 重置物料搜索 */
-    resetMaterialQuery() {
-      this.resetForm('materialQueryForm')
-      this.materialQueryParams.enterCoilNo = null
-      this.materialQueryParams.currentCoilNo = null
-      this.handleMaterialQuery()
-    },
-
-    // ========== 待操作列表相关方法 ==========
-    /** 查询待操作列表 */
-    getPendingAction() {
-      // 确保只查询酸连轧工序的待操作
-      if (!this.acidRollingActionType) {
-        console.warn(`未找到${this.label}操作类型，请检查字典配置`)
-        this.pendingActionList = []
-        this.actionTotal = 0
-        this.actionLoading = false
-        return
-      }
-
-      this.actionLoading = true
-      // 强制使用酸连轧工序的 actionType，忽略查询参数中的 actionType
-      const queryParams = {
-        ...this.actionQueryParams,
-        actionType: this.acidRollingActionType
-      }
-      listPendingAction(queryParams).then(response => {
-        this.pendingActionList = response.rows || []
-        this.actionTotal = response.total || 0
-        this.actionLoading = false
-      }).catch(() => {
-        this.actionLoading = false
-      })
-    },
-    handleCorrectMaterial(row) {
-      this.originCoil = { ...row }
-      this.form = {
-        ...row,
-      };
-      this.title = "钢卷调拨";
-      this.correctVisible = true
-    },
-    cancel() {
-      this.correctVisible = false
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (!valid) {
-          this.$message.error('请填写完整信息')
-          return
-        }
-        this.buttonLoading = true;
-        if (this.form.coilId) {
-          // 如果更新前和更新后的itemType或者warehouseId发生变化，则需要额外创建一条调拨记录
-          if (this.originCoil.itemType !== this.form.itemType || this.originCoil.warehouseId !== this.form.warehouseId) {
-            // 调拨记录逻辑
-            addTransferOrderItem({
-              coilId: this.form.coilId,
-              itemIdBefore: this.originCoil.itemId,
-              itemIdAfter: this.form.itemId,
-              materialTypeBefore: this.originCoil.itemType == 'product' ? 2 : 1,
-              materialTypeAfter: this.form.itemType == 'product' ? 2 : 1,
-              warehouseIdBefore: this.originCoil.warehouseId,
-              warehouseIdAfter: this.form.warehouseId,
-            })
-          }
-          // 更新
-          updateMaterialCoilSimple(this.form).then(_ => {
-            this.$modal.msgSuccess("调拨完成");
-            this.correctVisible = false;
-            this.getMaterialCoil();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
-        } else {
-          // 新增
-          addMaterialCoil(this.form).then(_ => {
-            this.$modal.msgSuccess("新增成功");
-            this.correctVisible = false;
-            this.getMaterialCoil();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    hanleDeleteMaterial(row) {
-      const coilIds = row.coilId;
-      this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项？').then(() => {
-        this.loading = true;
-        return delMaterialCoil(coilIds);
-      }).then(() => {
-        this.loading = false;
-        this.getMaterialCoil();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 处理操作 - 跳转到对应页面 */
-    handleProcess(row) {
-      const actionType = parseInt(row.actionType)
-
-      // 特殊处理：发货和移库操作不需要跳转
-      if (actionType === 4 || actionType === 5) {
-        this.$message.info(actionType === 4 ? '发货操作已在移动端完成' : '移库操作已在移动端完成')
-        return
-      }
-
-      // 根据操作类型跳转到不同页面
-      let path = ''
-
-      // 分条操作：100-199
-      if (actionType >= 100 && actionType <= 199) {
-        path = '/wms/split'
-      }
-      // 合卷操作：200-299
-      else if (actionType == 200) {
-        path = '/wms/merge'
-      }
-      // 其他操作类型
-      else {
-        path = '/wms/typing'
-      }
-
-      if (!path) {
-        this.$message.error('未知的操作类型: ' + row.actionType)
-        return
-      }
-
-      // 更新状态为处理中
-      startProcess(row.actionId).then(response => {
-        if (response.code !== 200) {
-          this.$message.error(response.msg || '更新状态失败')
-          return
-        }
-
-        // 跳转并传递参数
-        this.$router.push({
-          path: path,
-          query: {
-            coilId: row.coilId,
-            actionId: row.actionId
-          }
-        })
-      }).catch(error => {
-        console.error('更新状态失败:', error)
-        this.$message.error('更新状态失败: ' + (error.message || error))
-      })
-    },
-    /** 取消操作 */
-    handleCancel(row) {
-      this.$confirm('是否确认取消该操作?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        return cancelAction(row.actionId)
-      }).then(() => {
-        this.$message.success('操作已取消')
-        this.getPendingAction()
-      }).catch(() => { })
-    },
-    /** 删除待操作 */
-    handleDeleteAction(row) {
-      const actionId = row.actionId
-      this.$confirm('是否确认删除该待操作记录?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        return delPendingAction(actionId)
-      }).then(() => {
-        this.getPendingAction()
-        this.$message.success('删除成功')
-      }).catch(() => { })
-    },
-    /** 获取物品名称 */
-    getItemName(item) {
-      if (item.itemName) {
-        return item.itemName
-      }
-      return '—'
-    },
-    handleAddAbnormal(row) {
-      this.exceptionForm.coilId = row.coilId
-      this.exceptionDialogVisible = true
-    },
-    confirmException() {
-      addCoilAbnormal(this.exceptionForm).then(response => {
-        this.$message.success('异常记录添加成功')
-        this.cancelException();
-        // 重置表单
-        this.getMaterialCoil()
-      }).catch(error => {
-        console.error('异常记录添加失败:', error)
-        this.$message.error('异常记录添加失败: ' + (error.message || error))
-      })
-
-    },
-    handleAbnormal() {
-      this.$router.push({
-        path: '/quality/detail',
-        query: {
-          coilId: this.exceptionForm.coilId,
-        }
-      })
-    },
-    cancelException() {
-      // 重置表单
-      this.exceptionForm = {
-        coilId: null,
-        position: null,
-        lengthCoord: null,
-        defectCode: null,
-        degree: null,
-        remark: null
-      }
-      this.exceptionDialogVisible = false
-    },
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.acid-do-container {
-  background-color: #f5f7fa;
-  padding: 20px;
-  min-height: calc(100vh - 84px);
-}
-
-.section-card {
-  background-color: #ffffff;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
-  padding: 16px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-}
-
-.section-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16px;
-  padding-bottom: 12px;
-  border-bottom: 2px solid #e4e7ed;
-}
-
-.section-title {
-  margin: 0;
-  font-size: 16px;
-  font-weight: 600;
-  color: #303133;
-}
-
-.section-desc {
-  font-size: 12px;
-  color: #909399;
-}
-
-.material-section {
-  .section-header {
-    border-bottom-color: #409eff;
-  }
-
-  .section-title {
-    color: #409eff;
-  }
-}
-
-.action-section {
-  .section-header {
-    border-bottom-color: #67c23a;
-  }
-
-  .section-title {
-    color: #67c23a;
-  }
-}
-
-.query-form {
-  margin-bottom: 16px;
-  padding: 12px;
-  background-color: #fafafa;
-  border-radius: 4px;
-  border: 1px solid #e4e7ed;
-}
-
-// 卡片网格容器
-.card-grid-container {
-  display: grid;
-  grid-template-columns: repeat(5, 1fr);
-  gap: 8px;
-  max-height: calc(100vh - 320px);
-  overflow-y: auto;
-  padding-right: 4px;
-
-  &::-webkit-scrollbar {
-    width: 6px;
-  }
-
-  &::-webkit-scrollbar-track {
-    background: #f1f1f1;
-    border-radius: 3px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: #c1c1c1;
-    border-radius: 3px;
-
-    &:hover {
-      background: #a8a8a8;
-    }
-  }
-
-  @media (min-width: 1600px) {
-    grid-template-columns: repeat(4, 1fr);
-  }
-}
-
-// 空状态
-.empty-state {
-  text-align: center;
-  padding: 60px 20px;
-  color: #909399;
-
-  i {
-    font-size: 48px;
-    margin-bottom: 16px;
-    display: block;
-    color: #c0c4cc;
-  }
-
-  p {
-    margin: 0;
-    font-size: 14px;
-  }
-}
-
-// 物料卡片
-.material-card {
-  background-color: #ffffff;
-  border: 1px solid #e4e7ed;
-  border-radius: 3px;
-  display: flex;
-  flex-direction: column;
-  transition: all 0.3s ease;
-  height: 100%;
-
-  &:hover {
-    border-color: #409eff;
-    box-shadow: 0 2px 6px rgba(64, 158, 255, 0.12);
-  }
-
-  .card-header {
-    padding: 6px 8px;
-    border-bottom: 1px solid #e4e7ed;
-    background-color: #fafafa;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-    }
-
-    .coil-no-tag {
-      font-weight: 600;
-      font-size: 11px;
-      padding: 2px 6px;
-    }
-
-    .material-type {
-      font-size: 11px;
-      color: #606266;
-      font-weight: 500;
-    }
-
-    .param-icon {
-      font-size: 13px;
-      color: #909399;
-      cursor: pointer;
-      transition: color 0.3s;
-
-      &:hover {
-        color: #409eff;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 8px;
-    flex: 1;
-
-    .info-list {
-      .info-item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 4px;
-        font-size: 11px;
-        line-height: 1.4;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        .info-label {
-          color: #909399;
-          white-space: nowrap;
-          margin-right: 4px;
-          min-width: 40px;
-          font-size: 11px;
-        }
-
-        .info-value {
-          color: #303133;
-          flex: 1;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          font-size: 11px;
-        }
-      }
-    }
-  }
-
-  .card-footer {
-    padding: 6px 8px;
-    border-top: 1px solid #e4e7ed;
-    background-color: #fafafa;
-    display: flex;
-    justify-content: center;
-
-    .action-btn {
-      width: 100%;
-      padding: 5px 10px;
-      font-size: 11px;
-    }
-  }
-}
-
-// 待操作卡片
-.action-card {
-  background-color: #ffffff;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
-  display: flex;
-  flex-direction: column;
-  transition: all 0.3s ease;
-  height: 100%;
-
-  &:hover {
-    border-color: #67c23a;
-    box-shadow: 0 2px 8px rgba(103, 194, 58, 0.15);
-  }
-
-  &.urgent-card {
-    border-left: 4px solid #f56c6c;
-    background-color: #fef0f0;
-
-    &:hover {
-      border-color: #f56c6c;
-      box-shadow: 0 2px 8px rgba(245, 108, 108, 0.2);
-    }
-  }
-
-  &.important-card {
-    border-left: 4px solid #e6a23c;
-    background-color: #fdf6ec;
-
-    &:hover {
-      border-color: #e6a23c;
-      box-shadow: 0 2px 8px rgba(230, 162, 60, 0.2);
-    }
-  }
-
-  .card-header {
-    padding: 10px 12px;
-    border-bottom: 1px solid #e4e7ed;
-    background-color: #fafafa;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .coil-no-tag {
-      font-weight: 600;
-      font-size: 12px;
-    }
-
-    .status-tags {
-      display: flex;
-      gap: 4px;
-      flex-wrap: wrap;
-    }
-  }
-
-  .card-body {
-    padding: 12px;
-    flex: 1;
-
-    .info-list {
-      .info-item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 8px;
-        font-size: 12px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        .info-label {
-          color: #909399;
-          white-space: nowrap;
-          margin-right: 6px;
-          min-width: 50px;
-        }
-
-        .info-value {
-          color: #303133;
-          flex: 1;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-
-        .action-type-tag {
-          font-size: 11px;
-        }
-      }
-    }
-  }
-
-  .card-footer {
-    padding: 10px 12px;
-    border-top: 1px solid #e4e7ed;
-    background-color: #fafafa;
-    display: flex;
-    justify-content: center;
-    gap: 6px;
-
-    .action-btn {
-      flex: 1;
-      font-size: 12px;
-      padding: 6px 8px;
-    }
-  }
-}
-
-// 分页样式
-::v-deep .pagination-container {
-  margin-top: 16px;
-  padding: 12px;
-  background-color: #fafafa;
-  border-radius: 4px;
-  border: 1px solid #e4e7ed;
-}
-
-// 参数弹出框样式
-::v-deep .material-params-popover {
-  .material-params-content {
-    .params-title {
-      font-size: 14px;
-      font-weight: 600;
-      color: #303133;
-      margin-bottom: 12px;
-      padding-bottom: 8px;
-      border-bottom: 1px solid #e4e7ed;
-    }
-
-    .params-list {
-      .param-item {
-        .param-row {
-          display: flex;
-          margin-bottom: 6px;
-          font-size: 12px;
-          line-height: 1.5;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
-
-          .param-label {
-            color: #909399;
-            min-width: 70px;
-            margin-right: 8px;
-          }
-
-          .param-value {
-            color: #303133;
-            flex: 1;
-            word-break: break-all;
-          }
-        }
-      }
-
-      .param-divider {
-        height: 1px;
-        background-color: #e4e7ed;
-        margin: 10px 0;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue
deleted file mode 100644
index f3c314d9..00000000
--- a/klp-ui/src/views/wms/move/record.vue
+++ /dev/null
@@ -1,359 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="钢卷id" prop="coilId">
-        <el-input
-          v-model="queryParams.coilId"
-          placeholder="请输入钢卷id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨前itemId" prop="itemIdBefore">
-        <el-input
-          v-model="queryParams.itemIdBefore"
-          placeholder="请输入调拨前itemId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨后itemId" prop="itemIdAfter">
-        <el-input
-          v-model="queryParams.itemIdAfter"
-          placeholder="请输入调拨后itemId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
-        <el-input
-          v-model="queryParams.materialTypeBefore"
-          placeholder="请输入修改前物料类型 1-原料 2-成品"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
-        <el-input
-          v-model="queryParams.materialTypeAfter"
-          placeholder="请输入修改后物料类型 1-原料 2-成品"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
-        <el-input
-          v-model="queryParams.warehouseIdBefore"
-          placeholder="请输入调拨前逻辑库区ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
-        <el-input
-          v-model="queryParams.warehouseIdAfter"
-          placeholder="请输入调拨后逻辑库区ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <TransferItemTable :data="list" />
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改调拨单明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="关联调拨单ID" prop="transferId">
-          <el-input v-model="form.transferId" placeholder="请输入关联调拨单ID" />
-        </el-form-item>
-        <el-form-item label="钢卷id" prop="coilId">
-          <el-input v-model="form.coilId" placeholder="请输入钢卷id" />
-        </el-form-item>
-        <el-form-item label="调拨前itemId" prop="itemIdBefore">
-          <el-input v-model="form.itemIdBefore" placeholder="请输入调拨前itemId" />
-        </el-form-item>
-        <el-form-item label="调拨后itemId" prop="itemIdAfter">
-          <el-input v-model="form.itemIdAfter" placeholder="请输入调拨后itemId" />
-        </el-form-item>
-        <el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
-          <el-input v-model="form.materialTypeBefore" placeholder="请输入修改前物料类型 1-原料 2-成品" />
-        </el-form-item>
-        <el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
-          <el-input v-model="form.materialTypeAfter" placeholder="请输入修改后物料类型 1-原料 2-成品" />
-        </el-form-item>
-        <el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
-          <el-input v-model="form.warehouseIdBefore" placeholder="请输入调拨前逻辑库区ID" />
-        </el-form-item>
-        <el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
-          <el-input v-model="form.warehouseIdAfter" placeholder="请输入调拨后逻辑库区ID" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listTransferOrderItem, getTransferOrderItem, delTransferOrderItem, addTransferOrderItem, updateTransferOrderItem } from "@/api/wms/transferOrderItem";
-import TransferItemTable from "./components/tranferItemTable.vue";
-
-export default {
-  name: "TransferOrderItem",
-  components: {
-    TransferItemTable,
-  },
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 调拨单明细表格数据
-      transferOrderItemList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        transferId: undefined,
-        coilId: undefined,
-        itemIdBefore: undefined,
-        itemIdAfter: undefined,
-        materialTypeBefore: undefined,
-        materialTypeAfter: undefined,
-        warehouseIdBefore: undefined,
-        warehouseIdAfter: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        orderItemId: [
-          { required: true, message: "调拨明细主键ID不能为空", trigger: "blur" }
-        ],
-        transferId: [
-          { required: true, message: "关联调拨单ID不能为空", trigger: "blur" }
-        ],
-        coilId: [
-          { required: true, message: "钢卷id不能为空", trigger: "blur" }
-        ],
-        itemIdBefore: [
-          { required: true, message: "调拨前itemId不能为空", trigger: "blur" }
-        ],
-        itemIdAfter: [
-          { required: true, message: "调拨后itemId不能为空", trigger: "blur" }
-        ],
-        materialTypeBefore: [
-          { required: true, message: "修改前物料类型 1-原料 2-成品不能为空", trigger: "blur" }
-        ],
-        materialTypeAfter: [
-          { required: true, message: "修改后物料类型 1-原料 2-成品不能为空", trigger: "blur" }
-        ],
-        warehouseIdBefore: [
-          { required: true, message: "调拨前逻辑库区ID不能为空", trigger: "blur" }
-        ],
-        warehouseIdAfter: [
-          { required: true, message: "调拨后逻辑库区ID不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询调拨单明细列表 */
-    getList() {
-      this.loading = true;
-      listTransferOrderItem(this.queryParams).then(response => {
-        this.transferOrderItemList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        orderItemId: undefined,
-        transferId: undefined,
-        coilId: undefined,
-        itemIdBefore: undefined,
-        itemIdAfter: undefined,
-        materialTypeBefore: undefined,
-        materialTypeAfter: undefined,
-        warehouseIdBefore: undefined,
-        warehouseIdAfter: undefined,
-        remark: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        updateBy: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderItemId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加调拨单明细";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const orderItemId = row.orderItemId || this.ids
-      getTransferOrderItem(orderItemId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改调拨单明细";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.orderItemId != null) {
-            updateTransferOrderItem(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addTransferOrderItem(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const orderItemIds = row.orderItemId || this.ids;
-      this.$modal.confirm('是否确认删除调拨单明细编号为"' + orderItemIds + '"的数据项？').then(() => {
-        this.loading = true;
-        return delTransferOrderItem(orderItemIds);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('wms/transferOrderItem/export', {
-        ...this.queryParams
-      }, `transferOrderItem_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
index 06a25d3a..3f206100 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
@@ -541,7 +541,7 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
                 throw new IllegalArgumentException("调拨单不存在");
             }
             // 审批状态: 0-待审批 1-已通过 2-已驳回
-            if (wmsTransferOrder.getApproveStatus() == null || wmsTransferOrder.getApproveStatus() != 1) {
+            if (wmsTransferOrder.getApproveStatus() == null || wmsTransferOrder.getApproveStatus() != 2) {
                 throw new IllegalArgumentException("审批未通过，不能调拨");
             }
         }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java
index 14c22e4d..0339d061 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java
@@ -120,14 +120,14 @@ public class WmsTransferOrderServiceImpl implements IWmsTransferOrderService {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        
+
         // 先删除关联的调拨单明细记录
         if (ids != null && !ids.isEmpty()) {
             LambdaQueryWrapper<WmsTransferOrderItem> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(WmsTransferOrderItem::getTransferId, ids);
             wmsTransferOrderItemMapper.delete(queryWrapper);
         }
-        
+
         // 再删除调拨单主记录
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -141,7 +141,7 @@ public class WmsTransferOrderServiceImpl implements IWmsTransferOrderService {
         if (order == null) {
             throw new RuntimeException("调拨单不存在");
         }
-        if (order.getApproveStatus() != null && order.getApproveStatus() != 0) {
+        if (order.getApproveStatus() != null && order.getApproveStatus() != 1) {
             throw new RuntimeException("该调拨单已审批，不能重复审批");
         }
         order.setApproveStatus(approveStatus);