From 9d7ce2472d0b89e58c4bbfb13ce7c00a19a4ec41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 24 Nov 2025 17:21:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=82=AC=E5=81=9C=E5=BC=B9=E7=AA=97=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor: 重构原材料信息组件，采用与产品信息一致的交互方式
fix: 移除酸连轧工序页面，该功能已迁移至其他模块
style: 调整元素阴影样式，移除不必要的样式属性
chore: 添加调试日志，便于追踪参数传递
---
 klp-ui/src/assets/styles/element-ui.scss      |    2 +-
 .../KLPService/RawMaterialSelect/index.vue    |    1 +
 .../KLPService/Renderer/ProductInfo.vue       |  104 +-
 .../KLPService/Renderer/RawMaterialInfo.vue   |   95 +-
 klp-ui/src/views/wms/coil/actflow.vue         |    1 +
 klp-ui/src/views/wms/coil/do/acid.vue         | 1000 -----------------
 klp-ui/src/views/wms/coil/do/warehousing.vue  |    5 +-
 7 files changed, 69 insertions(+), 1139 deletions(-)
 delete mode 100644 klp-ui/src/views/wms/coil/do/acid.vue

diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 981bb317..b3cf536d 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -1303,7 +1303,7 @@ body {
 .el-descriptions {
   width: 100%;
   // background: $--color-background !important; // 黑色背景
-  box-shadow: $--metal-shadow;
+  // box-shadow: $--metal-shadow;
   overflow: hidden;
   color: $--color-text-primary; // 白色文字
 
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 19320267..404954c7 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -186,6 +186,7 @@ export default {
       try {
         this.loading = true;
         const params = { ...this.queryParams, ...this.filters };
+        console.log('params', params);
         const response = await listRawMaterial(params);
         if (response.code === 200) {
           this.rawMaterialList = response.rows.map(item => ({
diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
index 4ecb3cec..24962f31 100644
--- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
@@ -1,71 +1,60 @@
 <template>
   <div>
-    <span class="product-name" @click.stop="clickHandle">
-      <slot name="default" :product="productFull">
-        {{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}] - (材质：{{ productFull.material || '无材质' }})
-      </slot>
-    </span>
-    <el-dialog 
-      :visible="showDetail" 
-      @close="showDetail = false" 
-      :title="productFull.productName || '--' " 
-      width="500px"
-      append-to-body
+    <el-popover
+      trigger="hover"
+      placement="top" 
+      width="400"  
+      :visible-arrow="true" 
+      append-to-body 
+      popper-class="product-info-popover"
     >
-      <el-descriptions :column="1" border>
+      <!-- popover 内容（原dialog中的描述列表） -->
+      <el-descriptions :column="2" class="popover-content">
         <el-descriptions-item label="产品名称">
-          {{ product.productName || '--' }}
+          {{ productFull.productName || '--' }}
         </el-descriptions-item>
         <el-descriptions-item label="产品编码">
-          {{ product.productCode || '--' }}
+          {{ productFull.productCode || '--' }}
         </el-descriptions-item>
         <el-descriptions-item label="规格">
-          {{ product.specification || '--' }}
+          {{ productFull.specification || '--' }}
         </el-descriptions-item>
         <el-descriptions-item label="材质">
-          {{ product.material || '--' }}
+          {{ productFull.material || '--' }}
         </el-descriptions-item>
         <el-descriptions-item label="表面处理">
-          {{ product.surfaceTreatment || '--' }}
+          {{ productFull.surfaceTreatment || '--' }}
         </el-descriptions-item>
-        <!-- 锌层 -->
         <el-descriptions-item label="锌层">
-          {{ product.zincLayer || '--' }}
+          {{ productFull.zincLayer || '--' }}
         </el-descriptions-item>
-        <!-- 厂家 -->
         <el-descriptions-item label="厂家">
-          {{ product.manufacturer || '--' }}
+          {{ productFull.manufacturer || '--' }}
         </el-descriptions-item>
-
       </el-descriptions>
-      <!-- <BomInfo :bomId="product.bomId" /> -->
-    </el-dialog>
+
+      <!-- 触发元素（原产品名称文本） -->
+      <span slot="reference" class="product-name">
+        <slot name="default" :product="productFull">
+          {{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}] - (材质：{{ productFull.material || '无材质' }})
+        </slot>
+      </span>
+    </el-popover>
   </div>
 </template>
 
 <script>
-// import { mapState } from 'vuex';
-// import BomInfo from './BomInfo.vue';
-
 export default {
   name: 'ProductInfo',
-  // components: {
-  //   BomInfo
-  // },
   props: {
     product: {
       type: Object,
-      // required: true,
       default: () => ({})
     },
   },
-  // mounted() {
-    // console.log(this.productId, this.productMap);
-  // },
   data() {
     return {
-      showDetail: false,
-      // product: {},
+      // 移除showDetail，无需弹窗控制
     };
   },
   computed: {
@@ -83,44 +72,12 @@ export default {
         surfaceTreatment: this.product.surfaceTreatment || '',
         zincLayer: this.product.zincLayer || '',
         manufacturer: this.product.manufacturer || '',
-      }
+      };
     }
   },
-  // computed: {
-  //   ...mapState({
-  //     productMap: state => state.category.productMap
-  //   }),
-  //   product() {
-  //     // 检查 productMap 是否已加载
-  //     if (!this.productMap || Object.keys(this.productMap).length === 0) {
-  //       return {};
-  //     }
-  //     if (!this.productId) {
-  //       return {};
-  //     }
-  //     return this.productMap[this.productId.toString()] || {};
-  //   },
-  //   loading() {
-  //     return !this.productMap || Object.keys(this.productMap).length === 0
-  //   }
-  // },
   methods: {
-    clickHandle() {
-      this.showDetail = true;
-    }
+    // 移除clickHandle方法，无需点击触发
   },
-  // watch: {
-  //   productId: {
-  //     handler(newVal) {
-  //       if (!newVal) {
-  //         this.product = {};
-  //       }
-  //       const res = this.productMap[newVal.toString()] ? this.productMap[newVal.toString()] : {};
-  //       this.product = res;
-  //     },
-  //     immediate: true
-  //   }
-  // }
 };
 </script>
 
@@ -129,10 +86,7 @@ export default {
   color: #1890ff;
   cursor: pointer;
   text-decoration: underline;
-}
-
-/* 可选：调整描述列表的外边距 */
-:deep(.el-descriptions) {
-  margin-top: -10px;
+  /* 增加内边距，优化悬停触发区域 */
+  padding: 2px 4px;
 }
 </style>
\ No newline at end of file
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
index 9620237b..7e934459 100644
--- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
@@ -1,40 +1,37 @@
 <template>
   <div>
-    <!-- 作用域插槽 -->
-    <span class="material-name" @click.stop="showDetail = true">
-      <slot name="default" :material="materialFull">
-        {{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}] - (材质：{{ materialFull.material || '无材质' }})
-      </slot>
-    </span>
-    <el-dialog :visible="showDetail" @close="showDetail = false" :title="materialFull.rawMaterialName || '--'" width="600px"
-      append-to-body>
-      <el-descriptions :column="1" border>
-        <!-- <el-descriptions-item label="原材料ID">{{ materialFull.rawMaterialId }}</el-descriptions-item> -->
+    <!-- 原材料名称（仅hover触发popover） -->
+    <el-popover
+      trigger="hover" 
+      placement="top" 
+      width="400" 
+      :visible-arrow="true"
+      append-to-body 
+      popper-class="raw-material-info-popover"
+    >
+      <!-- popover 内容：两列布局的描述列表 -->
+      <el-descriptions :column="2" class="popover-content">
         <el-descriptions-item label="原材料名称">{{ materialFull.rawMaterialName || '--' }}</el-descriptions-item>
         <el-descriptions-item label="原材料编码">{{ materialFull.rawMaterialCode || '--' }}</el-descriptions-item>
         <el-descriptions-item label="规格">{{ materialFull.specification || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="材质">
-          {{ materialFull.material || '--' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="表面处理">
-          {{ materialFull.surfaceTreatment || '--' }}
-        </el-descriptions-item>
-        <!-- 锌层 -->
-        <el-descriptions-item label="锌层">
-          {{ materialFull.zincLayer || '--' }}
-        </el-descriptions-item>
-        <!-- 厂家 -->
-        <el-descriptions-item label="厂家">
-          {{ materialFull.manufacturer || '--' }}
-        </el-descriptions-item>
+        <el-descriptions-item label="材质">{{ materialFull.material || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="表面处理">{{ materialFull.surfaceTreatment || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="锌层">{{ materialFull.zincLayer || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="厂家">{{ materialFull.manufacturer || '--' }}</el-descriptions-item>
       </el-descriptions>
-      <!-- <BomInfo :bomId="material.bomId" /> -->
-    </el-dialog>
+
+      <!-- 触发元素（原材料名称文本） -->
+      <span slot="reference" class="material-name">
+        <slot name="default" :material="materialFull">
+          {{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}] - (材质：{{ materialFull.material || '无材质' }})
+        </slot>
+      </span>
+    </el-popover>
   </div>
 </template>
 
 <script>
-import BomInfo from './BomInfo.vue';
+import BomInfo from './BomInfo.vue'; // 保留导入（如需使用可解除注释）
 
 export default {
   name: 'RawMaterialInfo',
@@ -44,19 +41,17 @@ export default {
   props: {
     material: {
       type: Object,
-      // required: true,
       default: () => ({})
     }
   },
   data() {
     return {
-      showDetail: false,
-      // material: {},
+      // 移除showDetail：hover触发无需弹窗控制变量
     };
   },
   computed: {
     materialFull() {
-      // 完整的material, 确保每个字段都有值
+      // 完整的material，确保每个字段有默认值
       if (!this.material) {
         return {};
       }
@@ -69,37 +64,13 @@ export default {
         surfaceTreatment: this.material.surfaceTreatment || '',
         zincLayer: this.material.zincLayer || '',
         manufacturer: this.material.manufacturer || '',
-      }
+      };
     }
   },
-  // computed: {
-  //   ...mapState({
-  //     materialMap: state => state.category.rawMaterialMap // 假设vuex中为material模块
-  //   }),
-  //   material() {
-  //     // 检查 materialMap 是否已加载
-  //     if (!this.materialMap || Object.keys(this.materialMap).length === 0) {
-  //       return {};
-  //     }
-  //     if (!this.materialId) {
-  //       return {};
-  //     }
-  //     return this.materialMap[this.materialId.toString()] || {};
-  //   },
-  //   loading() {
-  //     return !this.materialMap || Object.keys(this.materialMap).length === 0
-  //   }
-  // },
-  // watch: {
-  //   materialId: {
-  //     handler: function (newVal) {
-  //       const res = this.materialMap[newVal.toString()] ? this.materialMap[newVal.toString()] : {};
-  //       this.material = res;
-  //     },
-  //     immediate: true
-  //   }
-  // }
-}
+  methods: {
+    // 移除click事件相关方法：无需点击触发
+  },
+};
 </script>
 
 <style scoped>
@@ -107,5 +78,7 @@ export default {
   color: #1890ff;
   cursor: pointer;
   text-decoration: underline;
+  /* 优化hover触发区域 */
+  padding: 2px 4px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index a0953a97..24901a43 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -81,6 +81,7 @@
              <span v-else-if="scope.row.actionType===4">发货操作已在移动端完成</span>
              <span v-else-if="scope.row.actionType===401">入库操作</span>
              <span v-else-if="scope.row.actionType===402">发货操作</span>
+             <span v-else-if="scope.row.actionType===403">移库操作</span>
           <dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType "></dict-tag>
         </template>
       </el-table-column>
diff --git a/klp-ui/src/views/wms/coil/do/acid.vue b/klp-ui/src/views/wms/coil/do/acid.vue
deleted file mode 100644
index 8fbabf0c..00000000
--- a/klp-ui/src/views/wms/coil/do/acid.vue
+++ /dev/null
@@ -1,1000 +0,0 @@
-<template>
-  <div class="app-container acid-do-container">
-    <el-row :gutter="20">
-      <!-- 左侧：物料列表 -->
-      <el-col :span="12">
-        <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"
-            >
-              <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.steelGrade">
-                            <span class="param-label">钢种：</span>
-                            <span class="param-value">{{ item.rawMaterial.steelGrade }}</span>
-                          </div>
-                          <div class="param-row" v-if="item.rawMaterial.thickness">
-                            <span class="param-label">厚度：</span>
-                            <span class="param-value">{{ item.rawMaterial.thickness }}mm</span>
-                          </div>
-                          <div class="param-row" v-if="item.rawMaterial.width">
-                            <span class="param-label">宽度：</span>
-                            <span class="param-value">{{ item.rawMaterial.width }}mm</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.thickness">
-                            <span class="param-label">厚度：</span>
-                            <span class="param-value">{{ item.product.thickness }}mm</span>
-                          </div>
-                          <div class="param-row" v-if="item.product.width">
-                            <span class="param-label">宽度：</span>
-                            <span class="param-value">{{ item.product.width }}mm</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>
-                </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="handlePickMaterial(item)"
-                  :loading="item.picking"
-                  class="action-btn"
-                >领料</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-col :span="12">
-        <div class="section-card action-section">
-          <div class="section-header">
-            <h3 class="section-title">酸连轧工序待操作</h3>
-            <el-button size="mini" icon="el-icon-refresh" @click="getPendingAction">刷新</el-button>
-          </div>
-
-          <!-- 搜索栏 -->
-          <el-form :model="actionQueryParams" ref="actionQueryForm" size="small" :inline="true" class="query-form">
-            <el-form-item label="钢卷号" prop="currentCoilNo">
-              <el-input
-                v-model="actionQueryParams.currentCoilNo"
-                placeholder="请输入钢卷号"
-                clearable
-                @keyup.enter.native="handleActionQuery"
-                style="width: 150px;"
-              />
-            </el-form-item>
-            <el-form-item label="操作状态" prop="actionStatus">
-              <el-select v-model="actionQueryParams.actionStatus" placeholder="请选择状态" clearable style="width: 120px;">
-                <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="handleActionQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetActionQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-
-          <!-- 待操作卡片列表 -->
-          <div v-loading="actionLoading" class="card-grid-container">
-            <div v-if="pendingActionList.length === 0" class="empty-state">
-              <i class="el-icon-document"></i>
-              <p>暂无待操作任务</p>
-            </div>
-            <div
-              v-for="(item, index) in pendingActionList"
-              :key="item.actionId || index"
-              class="action-card"
-              :class="{
-                'urgent-card': item.priority === 2,
-                'important-card': item.priority === 1
-              }"
-            >
-              <div class="card-header">
-                <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
-                <div class="status-tags">
-                  <el-tag v-if="item.actionStatus === 0" type="info" size="mini">待处理</el-tag>
-                  <el-tag v-else-if="item.actionStatus === 1" type="warning" size="mini">处理中</el-tag>
-                  <el-tag v-else-if="item.actionStatus === 2" type="success" size="mini">已完成</el-tag>
-                  <el-tag v-else-if="item.actionStatus === 3" type="danger" size="mini">已取消</el-tag>
-                  <el-tag v-if="item.priority === 2" type="danger" size="mini">紧急</el-tag>
-                  <el-tag v-else-if="item.priority === 1" type="warning" size="mini">重要</el-tag>
-                </div>
-              </div>
-              
-              <div class="card-body">
-                <div class="info-list">
-                  <div class="info-item">
-                    <span class="info-label">类型：</span>
-                    <dict-tag :options="dict.type.action_type" :value="item.actionType" class="action-type-tag"></dict-tag>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">来源：</span>
-                    <span class="info-value">
-                      <el-tag v-if="item.sourceType === 'scan'" type="success" size="mini">扫码</el-tag>
-                      <el-tag v-else type="info" size="mini">手动</el-tag>
-                    </span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">创建人：</span>
-                    <span class="info-value">{{ item.createBy || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">操作人：</span>
-                    <span class="info-value">{{ item.operatorName || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">扫码时间：</span>
-                    <span class="info-value">{{ parseTime(item.scanTime, '{m}-{d} {h}:{i}') || '—' }}</span>
-                  </div>
-                  <div class="info-item">
-                    <span class="info-label">处理时间：</span>
-                    <span class="info-value">{{ parseTime(item.processTime, '{m}-{d} {h}:{i}') || '—' }}</span>
-                  </div>
-                </div>
-              </div>
-              
-              <div class="card-footer">
-                <!-- 待处理状态显示操作按钮 -->
-                <template v-if="item.actionStatus === 0">
-                  <el-button
-                    type="primary"
-                    icon="el-icon-edit"
-                    size="mini"
-                    @click="handleProcess(item)"
-                    class="action-btn"
-                  >操作</el-button>
-                  <el-button
-                    type="danger"
-                    icon="el-icon-delete"
-                    size="mini"
-                    @click="handleDeleteAction(item)"
-                    class="action-btn"
-                  >删除</el-button>
-                </template>
-                <!-- 处理中状态显示继续按钮 -->
-                <template v-else-if="item.actionStatus === 1">
-                  <el-button
-                    type="warning"
-                    icon="el-icon-edit"
-                    size="mini"
-                    @click="handleProcess(item)"
-                    class="action-btn"
-                  >继续</el-button>
-                  <el-button
-                    type="info"
-                    icon="el-icon-close"
-                    size="mini"
-                    @click="handleCancel(item)"
-                    class="action-btn"
-                  >取消</el-button>
-                </template>
-                <!-- 已完成或已取消状态显示删除按钮 -->
-                <template v-else>
-                  <el-button
-                    type="danger"
-                    icon="el-icon-delete"
-                    size="mini"
-                    @click="handleDeleteAction(item)"
-                    class="action-btn"
-                  >删除</el-button>
-                </template>
-              </div>
-            </div>
-          </div>
-
-          <!-- 分页 -->
-          <pagination
-            v-show="actionTotal > 0"
-            :total="actionTotal"
-            :page.sync="actionQueryParams.pageNum"
-            :limit.sync="actionQueryParams.pageSize"
-            @pagination="getPendingAction"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { listMaterialCoil } 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'
-
-export default {
-  name: 'AcidDo',
-  dicts: ['action_type'],
-  components: {
-    ProductInfo,
-    RawMaterialInfo
-  },
-  data() {
-    return {
-      // 物料列表相关
-      materialLoading: false,
-      materialCoilList: [],
-      materialTotal: 0,
-      materialQueryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        dataType: 1,
-        materialType: '原料',
-        enterCoilNo: null,
-        currentCoilNo: null
-      },
-      
-      // 待操作列表相关
-      actionLoading: false,
-      pendingActionList: [],
-      actionTotal: 0,
-      actionQueryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        currentCoilNo: null,
-        actionType: null, // 将在created中设置为酸连轧工序的actionType
-        actionStatus: null
-      }
-    }
-  },
-  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('酸连轧') || label.includes('酸连')
-      })
-      return acidAction ? parseInt(acidAction.value) : null
-    }
-  },
-  watch: {
-    // 监听字典数据加载，当acidRollingActionType有值时自动加载待操作列表
-    acidRollingActionType(newVal) {
-      if (newVal && !this.actionQueryParams.actionType) {
-        this.actionQueryParams.actionType = newVal
-        // 如果待操作列表为空，则加载数据
-        if (this.pendingActionList.length === 0) {
-          this.getPendingAction()
-        }
-      }
-    }
-  },
-  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,
-    
-    // ========== 物料列表相关方法 ==========
-    /** 查询物料列表 */
-    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('未找到酸连轧工序操作类型，请检查字典配置')
-        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端领料创建-酸连轧工序`
-      }
-      
-      addPendingAction(pendingData).then(response => {
-        if (response.code === 200) {
-          this.$message.success('领料成功，已创建待操作任务')
-          this.getPendingAction() // 刷新待操作列表
-        } else {
-          this.$message.error(response.msg || '领料失败')
-        }
-      }).catch(error => {
-        console.error('领料失败：', error)
-        this.$message.error('领料失败，请重试')
-      }).finally(() => {
-        this.$set(row, 'picking', false)
-      })
-    },
-    
-    // ========== 待操作列表相关方法 ==========
-    /** 查询待操作列表 */
-    getPendingAction() {
-      // 确保只查询酸连轧工序的待操作
-      if (!this.acidRollingActionType) {
-        console.warn('未找到酸连轧工序操作类型，请检查字典配置')
-        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()
-    },
-    /** 重置待操作搜索 */
-    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 '—'
-    },
-  }
-}
-</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(3, 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/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 1ebd4d00..dc8a7fa2 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -202,11 +202,12 @@ export default {
       pendingActions: [],
       // 表单参数
       form: {
-        materialType: null,
+        materialType: '原料',
         enterCoilNo: null,
         currentCoilNo: null,
         itemId: null,
-        itemType: null,
+        itemType: 'raw_material',
+        warehouseId: '1988150044862377986', // 酸连轧原料库
         netWeight: null,
         grossWeight: null,
         remark: null,