diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index 6f396765..d992b769 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -205,7 +205,7 @@ export default {
         this.recentLoading = true;
         // 从localstorage中获取缓存的ids
         const ids = localStorage.getItem('recentlySelectedProductIds') || '';
-        const idsArray = ids.split(',');
+        const idsArray = ids.split(',').filter(id => id);
         if (idsArray.length === 0) return;
         const list = await Promise.all(idsArray.map(async id => {
           const response = await getProduct(id);
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 7b317379..6ed02a98 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -215,7 +215,8 @@ export default {
         this.recentLoading = true;
         // 从localstorage中获取缓存的ids
         const ids = localStorage.getItem('recentlySelectedRawMaterialIds') || '';
-        const idsArray = ids.split(',');
+        const idsArray = ids.split(',').filter(id => id);
+        console.log('idsArray', idsArray, idsArray.length === 0);
         if (idsArray.length === 0) return;
         const list = await Promise.all(idsArray.map(async id => {
           const response = await getRawMaterial(id);
diff --git a/klp-ui/src/layout/components/AppMain.vue b/klp-ui/src/layout/components/AppMain.vue
index a25c5625..d487588f 100644
--- a/klp-ui/src/layout/components/AppMain.vue
+++ b/klp-ui/src/layout/components/AppMain.vue
@@ -17,6 +17,7 @@ export default {
   components: { iframeToggle },
   computed: {
     cachedViews() {
+      console.log(this.$store.state.tagsView.cachedViews)
       return this.$store.state.tagsView.cachedViews
     },
     key() {
diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
new file mode 100644
index 00000000..56428531
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -0,0 +1,1124 @@
+<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">查找钢卷并修正</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="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>
+              <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-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="{ border: item.abnormalCount > 0 ? '1px solid red' : ' 1px solid #e4e7ed' }">
+              <div class="card-header">
+                <div class="header-left">
+                  <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                  <!-- <span class="material-type">{{ item.materialType || '原料' }}</span> -->
+                  <el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
+                    popper-class="material-params-popover">
+                    <div class="material-params-content">
+                      <div class="params-title">
+                        {{ item.itemType === 'raw_material' ? (item.rawMaterial && item.rawMaterial.rawMaterialName ||
+                          '—') : (item.product && item.product.productName || '—') }}
+                      </div>
+                      <div class="params-list">
+                        <div class="param-item" v-if="item.itemType === 'raw_material' && item.rawMaterial">
+                          <div class="param-row" v-if="item.rawMaterial.rawMaterialCode">
+                            <span class="param-label">编号：</span>
+                            <span class="param-value">{{ item.rawMaterial.rawMaterialCode }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.rawMaterial.specification">
+                            <span class="param-label">规格：</span>
+                            <span class="param-value">{{ item.rawMaterial.specification }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.rawMaterial.material">
+                            <span class="param-label">材质：</span>
+                            <span class="param-value">{{ item.rawMaterial.material }}</span>
+                          </div>
+
+                          <div class="param-row" v-if="item.rawMaterial.surfaceTreatment">
+                            <span class="param-label">表面处理：</span>
+                            <span class="param-value">{{ item.rawMaterial.surfaceTreatment }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.rawMaterial.zincLayer">
+                            <span class="param-label">锌层：</span>
+                            <span class="param-value">{{ item.rawMaterial.zincLayer }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.rawMaterial.manufacturer">
+                            <span class="param-label">厂家：</span>
+                            <span class="param-value">{{ item.rawMaterial.manufacturer }}</span>
+                          </div>
+                        </div>
+                        <div class="param-item" v-else-if="item.itemType === 'product' && item.product">
+                          <div class="param-row" v-if="item.product.productCode">
+                            <span class="param-label">编号：</span>
+                            <span class="param-value">{{ item.product.productCode }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.specification">
+                            <span class="param-label">规格：</span>
+                            <span class="param-value">{{ item.product.specification }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.material">
+                            <span class="param-label">材质：</span>
+                            <span class="param-value">{{ item.product.material }}</span>
+                          </div>
+
+                          <div class="param-row" v-if="item.product.surfaceTreatment">
+                            <span class="param-label">表面处理：</span>
+                            <span class="param-value">{{ item.product.surfaceTreatment }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.zincLayer">
+                            <span class="param-label">锌层：</span>
+                            <span class="param-value">{{ item.product.zincLayer }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.manufacturer">
+                            <span class="param-label">厂家：</span>
+                            <span class="param-value">{{ item.product.manufacturer }}</span>
+                          </div>
+                        </div>
+                        <div class="param-divider"></div>
+                        <div class="param-item">
+                          <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.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>
+                </div>
+              </div>
+
+              <div class="card-body">
+                <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>
+              </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-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="钢卷信息修正" :visible.sync="correctVisible" width="600px">
+      <el-form ref="form" :model="form" 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="请输入当前钢卷号" />
+        </el-form-item>
+        <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
+          <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
+        </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="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%">
+            <el-option key="甲" label="甲" value="甲" />
+            <el-option key="乙" label="乙" value="乙" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材料类型" prop="materialType" v-if="!form.coilId">
+          <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
+            <el-option label="成品" value="成品" />
+            <el-option label="原料" value="原料" />
+            <el-option label="废品" value="废品" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="getItemLabel" prop="itemId">
+          <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 v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
+          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
+            <el-option label="A+" value="A+" />
+            <el-option label="A" value="A" />
+            <el-option label="A-" value="A-" />
+            <el-option label="B+" value="B+" />
+            <el-option label="B" value="B" />
+            <el-option label="B-" value="B-" />
+            <el-option label="C+" value="C+" />
+            <el-option label="C" value="C" />
+            <el-option label="C-" value="C-" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
+            <el-option label="净边料" value="净边料" />
+            <el-option label="毛边料" value="毛边料" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
+          <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+          <el-select 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">
+          <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="净重" prop="netWeight">
+          <el-input v-model="form.netWeight" placeholder="请输入净重" />
+        </el-form-item>
+        <el-form-item label="长度" prop="length">
+          <el-input v-model="form.length" placeholder="请输入长度" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择创建时间" style="width: 100%;" />
+        </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 { listMaterialCoil, updateMaterialCoilSimple } from '@/api/wms/coil'
+import { listPendingAction, startProcess, cancelAction, delPendingAction, addPendingAction } 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 '../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";
+
+export default {
+  name: 'DoPage',
+  dicts: ['action_type', 'coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree'],
+  props: {
+    label: {
+      type: String,
+      default: () => '酸连轧工序'
+    },
+    tabs: {
+      type: Array,
+      default: () => []
+    }
+  },
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    LabelRender,
+    WarehouseSelect,
+    ActualWarehouseSelect,
+    ProductSelect,
+    RawMaterialSelect,
+  },
+  data() {
+    return {
+      // 物料列表相关
+      materialLoading: false,
+      materialCoilList: [],
+      materialTotal: 0,
+      currentTab: '',
+      materialQueryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        dataType: 1,
+        status: 0,
+        enterCoilNo: null,
+        currentCoilNo: 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
+      },
+      form: {},
+      correctVisible: false,
+      buttonLoading: false
+    }
+  },
+  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 === '原料' || 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()
+        }
+      }
+    },
+
+    tabs: {
+      handler(newVal) {
+        if (newVal.length > 0) {
+          // this.materialQueryParams.warehouseId = newVal[0]?.value || ''
+          // 设置currentTab为第一个tab的value
+          this.currentTab = newVal[0]?.value || undefined
+        }
+      },
+      immediate: true
+    },
+    currentTab: {
+      handler(newVal) {
+        if (newVal) {
+          this.materialQueryParams.warehouseId = newVal
+        }
+        this.getMaterialCoil()
+      },
+      immediate: true
+    }
+  },
+  created() {
+    // 立即加载物料列表（不依赖字典）
+    // this.getMaterialCoil()
+
+    // 尝试加载待操作列表（如果字典已加载）
+    this.$nextTick(() => {
+      if (this.acidRollingActionType) {
+        this.actionQueryParams.actionType = this.acidRollingActionType
+        this.getPendingAction()
+      }
+    })
+  },
+  mounted() {
+    // 确保在mounted时也尝试加载（字典数据可能此时才加载完成）
+    this.$nextTick(() => {
+      if (this.acidRollingActionType && !this.actionQueryParams.actionType) {
+        this.actionQueryParams.actionType = this.acidRollingActionType
+        this.getPendingAction()
+      }
+    })
+  },
+  methods: {
+    parseTime,
+    // 处理材料类型变化
+    handleMaterialTypeChange(value) {
+      // 清空物品选择
+      this.form.itemId = null;
+
+      // 根据材料类型设置物品类型
+      if (value === '成品') {
+        this.form.itemType = 'product';
+      } else if (value === '原料' || value === '废品') {
+        this.form.itemType = 'raw_material';
+      }
+    },
+    /** 预览标签 */
+    handlePreviewLabel(row) {
+      this.labelRender.visible = true;
+      const item = row.itemType === 'product' ? row.product : row.rawMaterial;
+      const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
+
+      this.labelRender.type = row.itemType === 'product' ? '3' : '2'
+      this.labelRender.data = {
+        ...row,
+        itemName: itemName,
+        updateTime: row.updateTime?.split(' ')[0] || '',
+      };
+    },
+    // ========== 物料列表相关方法 ==========
+    /** 查询物料列表 */
+    getMaterialCoil() {
+      this.materialLoading = true
+      listMaterialCoil(this.materialQueryParams).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()
+    },
+    /** 领料操作 */
+    handlePickMaterial(row) {
+      if (!this.acidRollingActionType) {
+        this.$message.error(`未找到${this.label}操作类型，请检查字典配置`)
+        return
+      }
+
+      this.$set(row, 'picking', true)
+
+      const pendingData = {
+        coilId: row.coilId,
+        currentCoilNo: row.currentCoilNo,
+        actionType: this.acidRollingActionType,
+        actionStatus: 0, // 待处理
+        sourceType: 'manual', // 手动创建
+        warehouseId: row.warehouseId,
+        priority: 0, // 默认普通优先级
+        remark: `PC端领料创建-${this.label}`
+      }
+
+      this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}？`).then(() => {
+        // 用户点击确认后执行的操作
+        return addPendingAction(pendingData)
+      }).then(response => {
+        this.$message.success('领料成功，已创建待操作任务')
+        this.getPendingAction() // 刷新待操作列表
+      }).finally(() => {
+        this.$set(row, 'picking', false)
+      })
+    },
+
+    // ========== 待操作列表相关方法 ==========
+    /** 查询待操作列表 */
+    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
+      })
+    },
+    /** 待操作搜索 */
+    handleActionQuery() {
+      this.actionQueryParams.pageNum = 1
+      // 确保始终使用酸连轧工序的 actionType
+      if (this.acidRollingActionType) {
+        this.actionQueryParams.actionType = this.acidRollingActionType
+      }
+      this.getPendingAction()
+    },
+    handleCorrectMaterial(row) {
+      this.form = {
+        ...row,
+      }
+      this.correctVisible = true
+    },
+    cancel() {
+      this.correctVisible = false
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.buttonLoading = true;
+      updateMaterialCoilSimple(this.form).then(_ => {
+        this.$modal.msgSuccess("修正成功");
+        this.correctVisible = false;
+        this.getMaterialCoil();
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
+    },
+
+    /** 重置待操作搜索 */
+    resetActionQuery() {
+      this.resetForm('actionQueryForm')
+      this.actionQueryParams.currentCoilNo = null
+      this.actionQueryParams.actionStatus = null
+      // 确保始终使用酸连轧工序的 actionType
+      if (this.acidRollingActionType) {
+        this.actionQueryParams.actionType = this.acidRollingActionType
+      }
+      this.handleActionQuery()
+    },
+    /** 处理操作 - 跳转到对应页面 */
+    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.itemType === 'product' && item.product) {
+        return item.product.productName || ''
+      } else if (item.itemType === 'raw_material' && item.rawMaterial) {
+        return item.rawMaterial.rawMaterialName || ''
+      }
+      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;
+}
+
+.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(6, 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/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 0c89a006..d5de7a05 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -96,7 +96,12 @@
       <el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
       <el-table-column label="长度 (米)" align="center" prop="length" v-if="showLength" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
-      <el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" />
+      <el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" width="160">
+        <template slot-scope="scope">
+          <el-date-picker @change="handleExportTimeChange(scope.row)" v-if="canEditExportTime" style="width: 90%" v-model="scope.row.exportTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择发货时间" />
+          <div v-else>{{ scope.row.exportTime }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
 
       <el-table-column label="二维码" v-if="qrcode">
@@ -173,7 +178,7 @@
             clearable />
         </el-form-item>
         <el-form-item label="班组" prop="team">
-          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" >
             <el-option key="甲" label="甲" value="甲" />
             <el-option key="乙" label="乙" value="乙" />
           </el-select>
@@ -193,7 +198,7 @@
           <div v-else>请先选择材料类型</div>
         </el-form-item>
         <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
-          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
             <el-option label="A+" value="A+" />
             <el-option label="A" value="A" />
             <el-option label="A-" value="A-" />
@@ -207,19 +212,19 @@
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
-          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
             <el-option label="净边料" value="净边料" />
             <el-option label="毛边料" value="毛边料" />
           </el-select>
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
-          <el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
+          <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
           </el-input>
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
-          <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%">
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
@@ -503,6 +508,12 @@ export default {
       }
       return '物品类型';
     },
+    canEditExportTime() {
+      // 徐梦琪和若依管理员
+      const canEdit = ['1988841895986642945', 1];
+      const currentUserId = this.$store.getters.id;
+      return canEdit.includes(currentUserId);
+    },
   },
   created() {
     this.getList();
@@ -529,7 +540,7 @@ export default {
         endTime: this.queryParams.updateTime?.[1],
       }
       // 如果没有设置itemType，则设置为raw_material
-      query.selectType = 'raw_material';
+      query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material';
       listMaterialCoil(query).then(response => {
         if (this.querys.warehouseId != 111) {
           // 排除掉111仓库的
@@ -795,6 +806,18 @@ export default {
       }).catch(() => {
       });
     },
+    handleExportTimeChange(row) {
+      if (row.exportTime) {
+        row.exportTime = row.exportTime.replace('T', ' ');
+      }
+      console.log(row);
+      updateMaterialCoilSimple(row).then(_ => {
+        this.$modal.msgSuccess("发货时间修改成功");
+        this.getList();
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const coilIds = row.coilId || this.ids;