feat(wms): 添加类型不匹配钢卷管理功能并优化材料类型处理

1. 新增类型不匹配钢卷查询接口和页面
2. 优化材料类型变更处理逻辑，自动清空物品选择
3. 移除表单复制时冗余的材料类型同步调用

klp-ui/src/api/wms/coil.js

@@ -379,3 +379,14 @@ export function listWithBindInfoCoil(params) {
     timeout: 600000
   })
 }
+
+/**
+ * 类型不匹配的卷
+ */
+export function listTypeErrorCoil() {
+  return request({
+    url: '/wms/materialCoil/queryMismatchedItemCoils',
+    method: 'get',
+    timeout: 600000
+  })
+}

klp-ui/src/views/wms/coil/panels/stepSplit.vue

@@ -610,8 +610,15 @@ export default {
 
     // 材料类型变更处理
     handleMaterialTypeChange(val) {
-      // 根据材料类型设置itemType
+       // 清空物品选择
-      this.splitForm.itemType = val === '成品' ? 'product' : val === '原料' ? 'raw_material' : ''
+      this.splitForm.itemId = null;
+
+      // 根据材料类型设置物品类型
+      if (val === '成品') {
+        this.splitForm.itemType = 'product';
+      } else if (val === '原料') {
+        this.splitForm.itemType = 'raw_material';
+      }
     },
 
     // 选中分条列表项（显示详情）
@@ -640,8 +647,6 @@ export default {
       this.selectedSplitItem = null
       // 赋值表单数据
       this.splitForm = { ...row }
-      // 同步材料类型和长度显示状态
-      this.handleMaterialTypeChange(row.materialType)
     },
 
     // 新增/编辑分条
@@ -883,11 +888,6 @@ export default {
         ...copiedFields
       };
 
-      // 同步材料类型和长度显示状态
-      if (this.splitForm.materialType) {
-        this.handleMaterialTypeChange(this.splitForm.materialType);
-      }
-
       this.$message.success('已复制源卷信息，请根据需要修改');
     }
   },

klp-ui/src/views/wms/coil/views/typeError.vue

@@ -0,0 +1,471 @@
+<template>
+  <div class="app-container" v-loading="loading" >
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        共 {{ totalCoil }} 卷
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <KLPTable :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true"
+      :floatLayerConfig="floatLayerConfig">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="产品类型" align="center" width="180">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
+        </template>
+      </el-table-column>
+      <el-table-column label="异常数量" align="center" prop="abnormalCount"></el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)">修正</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
+            预览标签
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-printer" @click="handlePrintLabel(scope.row)">
+            打印标签
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
+        </template>
+      </el-table-column>
+    </KLPTable>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 标签预览弹窗 -->
+    <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
+      <label-render :forceSpecialTag="forceSpecialTag" :content="labelRender.data" :labelType="labelRender.type" />
+    </el-dialog>
+
+    <label-render :forceSpecialTag="forceSpecialTag" ref="labelRender" v-show="false" :content="labelRender.data"
+      :labelType="labelRender.type" />
+
+    <!-- 钢卷追溯对话框（使用封装的组件） -->
+    <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>
+
+    <!-- 添加或修改钢卷物料对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <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="请输入当前钢卷号" />
+        </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" :clearInput="form.coilId != null"
+            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">
+          <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">
+          <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="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 label="原料材质" prop="packingStatus">
+          <el-input v-model="form.packingStatus" placeholder="请输入原料材质">
+          </el-input>
+        </el-form-item>
+        <el-form-item 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="实测长度(m)" prop="actualLength">
+          <el-input-number :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="实测厚度(m)" prop="actualThickness" class="form-item-half">
+          <el-input-number :controls="false" v-model="form.actualThickness" placeholder="请输入实测厚度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="实测宽度(m)" prop="actualWidth">
+          <el-input-number :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="调制度" prop="temperGrade">
+          <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
+        </el-form-item>
+        <el-form-item label="镀层种类" prop="coatingType">
+          <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+        </el-form-item>
+        <el-form-item label="钢卷表面处理" prop="coilSurfaceTreatment">
+          <el-input v-model="form.coilSurfaceTreatment" placeholder="请输入钢卷表面处理" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listTypeErrorCoil, getMaterialCoilTrace, getMaterialCoil, updateMaterialCoilSimple } from "@/api/wms/coil";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import ProductSelect from "@/components/KLPService/ProductSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilTraceResult from "../panels/CoilTraceResult.vue";
+import LabelRender from '../panels/LabelRender/index.vue';
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import CurrentCoilNo from "@/components/KLPService/Renderer/CurrentCoilNo.vue";
+import RightToolbar from "@/components/RightToolbar";
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
+import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint';
+
+export default {
+  name: "TypeErrorCoil",
+  components: {
+    WarehouseSelect,
+    ProductSelect,
+    RawMaterialSelect,
+    ProductInfo,
+    RawMaterialInfo,
+    CoilTraceResult,
+    LabelRender,
+    CoilNo,
+    CurrentCoilNo,
+    RightToolbar,
+    ActualWarehouseSelect,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 追溯加载中
+      traceLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 钢卷物料表格数据
+      materialCoilList: [],
+      // 追溯对话框显示
+      traceOpen: false,
+      // 追溯结果数据（传递给组件）
+      traceResult: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        enterCoilNo: undefined,
+        currentCoilNo: undefined,
+      },
+      labelRender: {
+        visible: false,
+        data: {},
+        type: '2'
+      },
+      forceSpecialTag: '',
+      floatLayerConfig: {
+        columns: [
+          { label: '入场钢卷号', prop: 'enterCoilNo' },
+          { label: '当前钢卷号', prop: 'currentCoilNo' },
+          { label: '厂家卷号', prop: 'supplierCoilNo' },
+          { label: '逻辑库位', prop: 'warehouseName' },
+          { label: '实际库位', prop: 'actualWarehouseName' },
+          { label: '物料类型', prop: 'materialType' },
+          { label: '班组', prop: 'team' },
+          { label: '净重', prop: 'netWeight' },
+          { label: '毛重', prop: 'grossWeight' },
+          { label: '备注', prop: 'remark' },
+          { label: '质量状态', prop: 'qualityStatus' },
+          { label: '原料材质', prop: 'packingStatus' },
+          { label: '切边要求', prop: 'edgeRequirement' },
+          { label: '包装要求', prop: 'packagingRequirement' },
+          { label: '厂家', prop: 'itemManufacturer' },
+          { label: '调制度', prop: 'temperGrade' },
+          { label: '镀层种类', prop: 'coatingType' },
+          { label: '实测长度(m)', prop: 'actualLength' },
+          { label: '实测宽度(m)', prop: 'actualWidth' },
+          { label: '实测厚度(m)', prop: 'actualThickness' },
+          { label: '钢卷表面处理', prop: 'coilSurfaceTreatment' },
+        ],
+        title: '详细信息'
+      },
+      // 按钮loading
+      buttonLoading: false,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        enterCoilNo: [
+          { required: true, message: "入场钢卷号不能为空", trigger: "blur" },
+        ],
+        currentCoilNo: [
+          { required: true, message: "当前钢卷号不能为空", trigger: "blur" },
+        ],
+        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" }
+        ],
+      },
+    };
+  },
+  computed: {
+    // 动态显示标签
+    getItemLabel() {
+      if (this.form.materialType === '成品') {
+        return '产品类型';
+      } else if (this.form.materialType === '原料') {
+        return '原料类型';
+      }
+      return '物品类型';
+    },
+    totalCoil() {
+      return this.materialCoilList.length;
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询类型不匹配的钢卷列表 */
+    getList() {
+      this.loading = true;
+      listTypeErrorCoil().then(response => {
+        this.materialCoilList = response.data || [];
+        this.total = response.total || 0;
+        this.loading = false;
+      });
+    },
+    /** 追溯按钮操作 */
+    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;
+      });
+    },
+    /** 预览标签 */
+    handlePreviewLabel(row) {
+      this.labelRender.visible = true;
+      const itemName = row.itemName || '';
+      
+      this.labelRender.type = row.itemType === 'product' ? '3' : '2';
+      this.labelRender.data = {
+        ...row,
+        itemName: itemName,
+        updateTime: row.updateTime?.split(' ')[0] || '',
+      };
+    },
+    /** 打印标签 */
+    handlePrintLabel(row) {
+      const type = getCoilTagPrintType(row);
+      this.labelRender.type = type;
+
+      this.labelRender.data = {
+        ...row,
+        updateTime: row.updateTime?.split(' ')[0] || '',
+      };
+      this.$nextTick(() => {
+        this.$refs.labelRender.printLabel();
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 重置表单 */
+    resetForm(formName) {
+      this.$refs[formName]?.resetFields();
+    },
+    /** 导出按钮操作 */
+    handleExportAll() {
+      // 导出逻辑
+      const coilIds = this.materialCoilList.map(item => item.coilId).join(',')
+      this.download('wms/materialCoil/export', {
+        coilIds
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.coilId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 处理材料类型变化 */
+    handleMaterialTypeChange(value) {
+      // 清空物品选择
+      this.form.itemId = null;
+
+      // 根据材料类型设置物品类型
+      if (value === '成品') {
+        this.form.itemType = 'product';
+      } else if (value === '原料') {
+        this.form.itemType = 'raw_material';
+      }
+    },
+    /** 修正按钮操作 */
+    handleCheck(row) {
+      this.reset();
+      const coilId = row.coilId || this.ids
+      getMaterialCoil(coilId).then(response => {
+        this.form = response.data;
+
+        // 设置 materialType（优先级：后端返回 > itemType推断）
+        if (!this.form.materialType) {
+          if (this.form.itemType) {
+            // 根据 itemType 推断
+            if (this.form.itemType === 'product') {
+              this.form.materialType = '成品';
+            } else if (this.form.itemType === 'raw_material') {
+              this.form.materialType = '原料';
+            }
+          }
+        }
+
+        this.open = true;
+        this.title = "修正钢卷物料";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    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,
+      };
+      this.resetForm("form");
+    },
+    /** 提交表单 */
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          updateMaterialCoilSimple(this.form).then(res => {
+            this.buttonLoading = false;
+            this.$message({
+              message: '更新成功',
+              type: 'success',
+            });
+            this.open = false;
+            this.getList();
+          })
+        } else {
+          return false;
+        }
+      })
+    },
+  }
+};
+</script>