From 7feaf8021b56de55d935c75b6e2c3da35974e922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 15 Jun 2026 10:56:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E8=BE=93=E5=85=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增validSpecification规格校验函数，校验格式为数字.两位小数*数字的钢卷规格
2. 为多个页面的钢卷号输入框添加trim修饰符自动去除首尾空格
3. 在API层统一对钢卷号字段做trim预处理
4. 为原料和产品表单添加规格必填校验和格式校验
5. 新增钢卷信息修正页面，添加生产耗时自动计算功能
6. 优化部分页面的UI和代码冗余
---
 klp-ui/src/api/wms/coil.js                    | 45 ++++++++--
 .../KLPService/ProductSelect/index.vue        |  4 +-
 .../KLPService/RawMaterialSelect/index.vue    |  4 +-
 klp-ui/src/utils/validate.js                  |  9 ++
 klp-ui/src/utils/validate.test.js             | 88 +++++++++++++++++++
 klp-ui/src/views/wms/coil/do/correct.vue      | 74 ++++++++++++++--
 klp-ui/src/views/wms/coil/do/correntAll.vue   | 87 +++++++++++++-----
 klp-ui/src/views/wms/coil/merge.vue           |  2 +-
 klp-ui/src/views/wms/coil/panels/do.vue       | 27 ------
 .../src/views/wms/coil/panels/stepSplit.vue   |  2 +-
 klp-ui/src/views/wms/coil/split.vue           |  2 +-
 klp-ui/src/views/wms/coil/typing.vue          |  2 +-
 klp-ui/src/views/wms/product/index.vue        |  5 ++
 klp-ui/src/views/wms/rawMaterial/index.vue    |  5 ++
 14 files changed, 290 insertions(+), 66 deletions(-)
 create mode 100644 klp-ui/src/utils/validate.test.js

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 0d71a0e4..d7ef2566 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -35,27 +35,42 @@ export function getMaterialCoil(CoilMaterialId) {
 }
 
 export function addMaterialCoil(data) {
+  // 对data进行预处理，将currentCoilNo去除首位的空格
+  const payload = {
+    ...data,
+    currentCoilNo: data.currentCoilNo.trim(),
+  }
   return request({
     url: '/wms/materialCoil',
     method: 'post',
-    data: data
+    data: payload
   })
 }
 
 export function updateMaterialCoil(data) {
+  // 对data进行预处理，将currentCoilNo去除首位的空格
+  const payload = {
+    ...data,
+    currentCoilNo: data.currentCoilNo.trim(),
+  }
   return request({
     url: '/wms/materialCoil',
     method: 'put',
-    data: data
+    data: payload
   })
 }
 
 // 简单更新钢卷物料表
 export function updateMaterialCoilSimple(data) {
+  // 对data进行预处理，将currentCoilNo去除首位的空格
+  const payload = {
+    ...data,
+    currentCoilNo: data.currentCoilNo.trim(),
+  }
   return request({
     url: '/wms/materialCoil/update',
     method: 'put',
-    data: data
+    data: payload
   })
 }
 
@@ -107,19 +122,32 @@ export function getMaterialCoilDistributionByActualWarehouse(query) {
 
 // 钢卷分卷
 export function splitMaterialCoil(data) {
+  const payload = {
+    ...data,
+    // currentCoilNo: data.currentCoilNo.trim(),
+    newCoils: data.newCoils?.map(item => ({
+      ...item,
+      currentCoilNo: item.currentCoilNo?.trim(),
+    })),
+  }
   return request({
     url: '/wms/materialCoil',
     method: 'put',
-    data: data
+    data: payload
   })
 }
 
 // 钢卷合卷
 export function mergeMaterialCoil(data) {
+  // 对data进行预处理，将currentCoilNo去除首位的空格
+  const payload = {
+    ...data,
+    currentCoilNo: data.currentCoilNo.trim(),
+  }
   return request({
     url: '/wms/materialCoil/merge',
     method: 'post',
-    data: data
+    data: payload
   })
 }
 
@@ -283,10 +311,15 @@ export function startSpecialSplit(coilId, actionType) {
  * 创建一个分条
  */
 export function createSpecialChild(parentCoilId, pendingActionId, data) {
+  // 对data进行预处理，将currentCoilNo去除首位的空格
+  const payload = {
+    ...data,
+    currentCoilNo: data.currentCoilNo.trim(),
+  }
   return request({
     url: '/wms/materialCoil/specialSplit/createChild',
     method: 'post',
-    data: data,
+    data: payload,
     params: {
       parentCoilId,
       pendingActionId
diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index 389537a4..53a23cce 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -145,6 +145,7 @@
 <script>
 import { listProduct, getProduct, addProduct } from '@/api/wms/product';
 import MemoInput from '@/components/MemoInput/index.vue';
+import { validSpecification } from '@/utils/validate';
 
 export default {
   name: 'ProductSelector',
@@ -184,7 +185,8 @@ export default {
           { required: true, message: "计量单位不能为空", trigger: "blur" }
         ],
         specification: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
+          { required: true, message: "规格不能为空", trigger: "blur" },
+          { validator: validSpecification, trigger: 'blur' }
         ],
       },
       buttonLoading: false,
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 4e4a9de2..40575867 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -130,6 +130,7 @@
 <script>
 import { listRawMaterial, getRawMaterial, updateRawMaterial, addRawMaterial } from '@/api/wms/rawMaterial';
 import MemoInput from '@/components/MemoInput/index.vue'
+import { validSpecification } from '@/utils/validate';
 
 export default {
   name: 'RawMaterialSelector',
@@ -197,7 +198,8 @@ export default {
           { required: true, message: "计量单位不能为空", trigger: "blur" }
         ],
         specification: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
+          { required: true, message: "规格不能为空", trigger: "blur" },
+          { validator: validSpecification, trigger: 'blur' }
         ],
       },
       // 提交按钮加载状态
diff --git a/klp-ui/src/utils/validate.js b/klp-ui/src/utils/validate.js
index adfa2542..25469910 100644
--- a/klp-ui/src/utils/validate.js
+++ b/klp-ui/src/utils/validate.js
@@ -81,3 +81,12 @@ export function isArray(arg) {
   }
   return Array.isArray(arg)
 }
+
+export function validSpecification(rule, value, callback) {
+  if (!value) { callback(); return; }
+  if (!/^\d+\.\d{2,}\*[\d.]+$/.test(value)) {
+    callback(new Error('规格异常'));
+  } else {
+    callback();
+  }
+}
diff --git a/klp-ui/src/utils/validate.test.js b/klp-ui/src/utils/validate.test.js
new file mode 100644
index 00000000..7eff2bb6
--- /dev/null
+++ b/klp-ui/src/utils/validate.test.js
@@ -0,0 +1,88 @@
+import { expect, test, describe } from '@jest/globals';
+import { validSpecification } from './validate.js';
+
+const callValidator = (value) => {
+  let err = null;
+  validSpecification(null, value, (e) => { err = e; });
+  return !err;
+};
+
+describe('validSpecification - 规格校验', () => {
+  describe('正常情况', () => {
+    test('1.50*1000', () => {
+      expect(callValidator('1.50*1000')).toBe(true);
+    });
+    test('0.35*1250.5', () => {
+      expect(callValidator('0.35*1250.5')).toBe(true);
+    });
+    test('2.385*1500', () => {
+      expect(callValidator('2.385*1500')).toBe(true);
+    });
+    test('10.00*500', () => {
+      expect(callValidator('10.00*500')).toBe(true);
+    });
+    test('0.25*2000', () => {
+      expect(callValidator('0.25*2000')).toBe(true);
+    });
+  });
+
+  describe('异常情况 - 厚度小数不足两位', () => {
+    test('1.5*1000 只有一位小数', () => {
+      expect(callValidator('1.5*1000')).toBe(false);
+    });
+    test('10*1000 没有小数', () => {
+      expect(callValidator('10*1000')).toBe(false);
+    });
+    test('5.*1000 0位小数', () => {
+      expect(callValidator('5.*1000')).toBe(false);
+    });
+  });
+
+  describe('异常情况 - 缺少星号分隔符', () => {
+    test('1.501000 无星号', () => {
+      expect(callValidator('1.501000')).toBe(false);
+    });
+    test('1.50 只有厚度', () => {
+      expect(callValidator('1.50')).toBe(false);
+    });
+  });
+
+  describe('异常情况 - 缺少厚度或宽度', () => {
+    test('*1000 缺厚度', () => {
+      expect(callValidator('*1000')).toBe(false);
+    });
+    test('1.50* 缺宽度', () => {
+      expect(callValidator('1.50*')).toBe(false);
+    });
+  });
+
+  describe('异常情况 - 非数字输入', () => {
+    test('abc*1000 厚度为字母', () => {
+      expect(callValidator('abc*1000')).toBe(false);
+    });
+    test('1.50*abc 宽度为字母', () => {
+      expect(callValidator('1.50*abc')).toBe(false);
+    });
+    test('一点五*一千 纯中文', () => {
+      expect(callValidator('一点五*一千')).toBe(false);
+    });
+  });
+
+  describe('异常情况 - 格式错误', () => {
+    test('1.50*1000*extra 多星号', () => {
+      expect(callValidator('1.50*1000*extra')).toBe(false);
+    });
+    test('空字符串通过必填之外校验', () => {
+      expect(callValidator('')).toBe(true);
+    });
+    test('星号在前', () => {
+      expect(callValidator('*1.50*1000')).toBe(false);
+    });
+    test('含空格', () => {
+      expect(callValidator(' 1.50*1000 ')).toBe(false);
+    });
+    test('中文×分隔符', () => {
+      expect(callValidator('1.50×1000')).toBe(false);
+    });
+  });
+});
diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index abbd78c9..dcf5091c 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -148,10 +148,10 @@
           <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-input v-model.trim="form.currentCoilNo" placeholder="请输入当前钢卷号" />
         </el-form-item>
         <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
-          <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
+          <el-input v-model.trim="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
         </el-form-item>
         <el-form-item label="所在库位" prop="warehouseId">
           <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
@@ -212,9 +212,6 @@
         <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="实测长度(mm)" prop="actualLength">
           <el-input-number :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
             :step="0.01" />
@@ -242,6 +239,24 @@
         <el-form-item label="钢卷表面处理" prop="coilSurfaceTreatment">
           <MemoInput storageKey="surfaceTreatmentDesc" v-model="form.coilSurfaceTreatment" placeholder="请输入钢卷表面处理" />
         </el-form-item>
+
+        <el-form-item label="排产厚度(mm)" prop="scheduleThickness">
+          <el-input-number :controls="false" v-model="form.scheduleThickness" placeholder="请输入排产厚度" type="number"
+            :step="0.001" style="width: 100%;" />
+        </el-form-item>
+
+        <el-form-item label="生产开始时间" prop="productionStartTime">
+          <TimeInput v-model="form.productionStartTime" @input="calculateProductionDuration" />
+        </el-form-item>
+
+        <el-form-item label="生产结束时间" prop="productionEndTime">
+          <TimeInput v-model="form.productionEndTime" @input="calculateProductionDuration" :show-now-button="true" />
+        </el-form-item>
+
+        <el-form-item label="生产耗时" prop="productionDuration">
+          <el-input v-model="form.formattedDuration" placeholder="自动计算" disabled />
+        </el-form-item>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -286,6 +301,8 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import CoilTraceResult from "../panels/CoilTraceResult.vue";
+import TimeInput from "@/components/TimeInput";
+import ContractSelect from "@/components/KLPService/ContractSelect";
 import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
 
 export default {
@@ -311,6 +328,8 @@ export default {
     ProductSelect,
     RawMaterialSelect,
     CoilTraceResult,
+    TimeInput,
+    ContractSelect,
   },
   data() {
     return {
@@ -477,6 +496,10 @@ export default {
           { label: '实测宽度(mm)', prop: 'actualWidth' },
           { label: '实测厚度(mm)', prop: 'actualThickness' },
           { label: '钢卷表面处理', prop: 'coilSurfaceTreatment' },
+          { label: '排产厚度(mm)', prop: 'scheduleThickness' },
+          { label: '生产开始时间', prop: 'productionStartTime' },
+          { label: '生产结束时间', prop: 'productionEndTime' },
+          { label: '生产耗时', prop: 'formattedDuration' },
         ],
         title: '详细信息'
       },
@@ -559,6 +582,38 @@ export default {
   },
   methods: {
     parseTime,
+    formatDuration(milliseconds) {
+      if (!milliseconds || milliseconds < 0) return '';
+      const seconds = Math.floor(milliseconds / 1000);
+      const minutes = Math.floor(seconds / 60);
+      const hours = Math.floor(minutes / 60);
+      const days = Math.floor(hours / 24);
+      const remainingHours = hours % 24;
+      const remainingMinutes = minutes % 60;
+      let result = '';
+      if (days > 0) result += `${days}天`;
+      if (remainingHours > 0) result += `${remainingHours}小时`;
+      if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+      return result || '0分钟';
+    },
+    calculateProductionDuration() {
+      const { productionStartTime, productionEndTime } = this.form;
+      if (productionStartTime && productionEndTime) {
+        const start = new Date(productionStartTime).getTime();
+        const end = new Date(productionEndTime).getTime();
+        if (end < start) {
+          this.form.productionDuration = '';
+          this.form.formattedDuration = '';
+        } else {
+          const durationMs = end - start;
+          this.form.productionDuration = Math.round(durationMs / (1000 * 60));
+          this.form.formattedDuration = this.formatDuration(durationMs);
+        }
+      } else {
+        this.form.productionDuration = '';
+        this.form.formattedDuration = '';
+      }
+    },
     // 进入数字钢卷页面
     handleNumberCoilClick(row) {
       this.$router.push({
@@ -627,6 +682,12 @@ export default {
         coatingType: undefined,
         actualLength: undefined,
         actualWidth: undefined,
+        scheduleThickness: undefined,
+        productionStartTime: undefined,
+        productionEndTime: undefined,
+        productionDuration: undefined,
+        formattedDuration: undefined,
+        contractId: undefined,
       };
       this.resetForm("form");
     },
@@ -816,6 +877,9 @@ export default {
       this.form = {
         ...row,
       };
+      if (this.form.productionDuration) {
+        this.form.formattedDuration = this.formatDuration(this.form.productionDuration * 60 * 1000);
+      }
       this.title = "钢卷信息修正";
       this.correctVisible = true
     },
diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue
index ea84f195..b1ad4cc1 100644
--- a/klp-ui/src/views/wms/coil/do/correntAll.vue
+++ b/klp-ui/src/views/wms/coil/do/correntAll.vue
@@ -232,11 +232,11 @@
         <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 label ="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model.trim="form.currentCoilNo" placeholder="请输入当前钢卷号" />
         </el-form-item>
         <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
-          <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
+          <el-input v-model.trim="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
         </el-form-item>
         <el-form-item label="所在库位" prop="warehouseId">
           <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
@@ -297,9 +297,6 @@
         <el-form-item label="净重" prop="netWeight">
           <el-input v-model="form.netWeight" placeholder="请输入净重" />
         </el-form-item>
-        <el-form-item label="长度(m)" prop="length">
-          <el-input v-model="form.length" 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" />
@@ -327,6 +324,24 @@
         <el-form-item label="钢卷表面处理" prop="coilSurfaceTreatment">
           <MemoInput storageKey="surfaceTreatmentDesc" v-model="form.coilSurfaceTreatment" placeholder="请输入钢卷表面处理" />
         </el-form-item>
+
+        <el-form-item label="排产厚度(mm)" prop="scheduleThickness">
+          <el-input-number :controls="false" v-model="form.scheduleThickness" placeholder="请输入排产厚度" type="number"
+            :step="0.001" style="width: 100%;" />
+        </el-form-item>
+
+        <el-form-item label="生产开始时间" prop="productionStartTime">
+          <TimeInput v-model="form.productionStartTime" @input="calculateProductionDuration" />
+        </el-form-item>
+
+        <el-form-item label="生产结束时间" prop="productionEndTime">
+          <TimeInput v-model="form.productionEndTime" @input="calculateProductionDuration" :show-now-button="true" />
+        </el-form-item>
+
+        <el-form-item label="生产耗时" prop="productionDuration">
+          <el-input v-model="form.formattedDuration" placeholder="自动计算" disabled />
+        </el-form-item>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -366,6 +381,8 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import CoilTraceResult from "../panels/CoilTraceResult.vue";
+import TimeInput from "@/components/TimeInput";
+import ContractSelect from "@/components/KLPService/ContractSelect";
 import CoilSelector from '@/components/CoilSelector';
 import CoilNo from '@/components/KLPService/Renderer/CoilNo.vue';
 import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
@@ -381,6 +398,8 @@ export default {
     ProductSelect,
     RawMaterialSelect,
     CoilTraceResult,
+    TimeInput,
+    ContractSelect,
     CoilSelector,
     CoilNo
   },
@@ -454,6 +473,10 @@ export default {
           { label: '实测宽度(mm)', prop: 'actualWidth' },
           { label: '实测厚度(mm)', prop: 'actualThickness' },
           { label: '钢卷表面处理', prop: 'coilSurfaceTreatment' },
+          { label: '排产厚度(mm)', prop: 'scheduleThickness' },
+          { label: '生产开始时间', prop: 'productionStartTime' },
+          { label: '生产结束时间', prop: 'productionEndTime' },
+          { label: '生产耗时', prop: 'formattedDuration' },
         ],
         title: '详细信息'
       },
@@ -586,6 +609,39 @@ export default {
   methods: {
     parseTime,
 
+    formatDuration(milliseconds) {
+      if (!milliseconds || milliseconds < 0) return '';
+      const seconds = Math.floor(milliseconds / 1000);
+      const minutes = Math.floor(seconds / 60);
+      const hours = Math.floor(minutes / 60);
+      const days = Math.floor(hours / 24);
+      const remainingHours = hours % 24;
+      const remainingMinutes = minutes % 60;
+      let result = '';
+      if (days > 0) result += `${days}天`;
+      if (remainingHours > 0) result += `${remainingHours}小时`;
+      if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+      return result || '0分钟';
+    },
+    calculateProductionDuration() {
+      const { productionStartTime, productionEndTime } = this.form;
+      if (productionStartTime && productionEndTime) {
+        const start = new Date(productionStartTime).getTime();
+        const end = new Date(productionEndTime).getTime();
+        if (end < start) {
+          this.form.productionDuration = '';
+          this.form.formattedDuration = '';
+        } else {
+          const durationMs = end - start;
+          this.form.productionDuration = Math.round(durationMs / (1000 * 60));
+          this.form.formattedDuration = this.formatDuration(durationMs);
+        }
+      } else {
+        this.form.productionDuration = '';
+        this.form.formattedDuration = '';
+      }
+    },
+
     /** 查询用户列表 */
     getUsers() {
       listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
@@ -794,6 +850,9 @@ export default {
       this.form = {
         ...row,
       };
+      if (this.form.productionDuration) {
+        this.form.formattedDuration = this.formatDuration(this.form.productionDuration * 60 * 1000);
+      }
       this.title = "钢卷信息修正";
       this.correctVisible = true
     },
@@ -1017,22 +1076,6 @@ export default {
       }
       return {}
     },
-
-    /** 根据操作类型获取图标 */
-    getActionIcon(actionType) {
-      const value = parseInt(actionType);
-      const iconMap = {
-        1: 'el-icon-connection',      // 合卷
-        2: 'el-icon-s-operation',      // 分条
-        3: 'el-icon-edit',             // 更新
-        4: 'el-icon-truck',            // 发货
-        5: 'el-icon-s-grid',           // 移库
-        101: 'el-icon-scissors',       // 纵剪分条
-        102: 'el-icon-s-operation',    // 横切分条
-        103: 'el-icon-s-unfold'        // 开卷分条
-      };
-      return iconMap[value] || 'el-icon-s-operation';
-    },
   }
 }
 </script>
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 831bbe4c..2665951e 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -111,7 +111,7 @@
             <el-form size="small" label-width="80px" :model="targetCoil" :rules="rules">
               <div class="form-row">
                 <el-form-item label="卷号" class="form-item-half" prop="currentCoilNo">
-                  <el-input v-model="targetCoil.currentCoilNo" placeholder="输入目标卷号" :disabled="readonly"></el-input>
+                  <el-input v-model.trim="targetCoil.currentCoilNo" placeholder="输入目标卷号" :disabled="readonly"></el-input>
                   <current-coil-no :current-coil-no="targetCoil.currentCoilNo" />
                 </el-form-item>
                 <el-form-item label="班组" class="form-item-half" prop="team">
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 97874b0e..9c6edb7b 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -32,11 +32,6 @@
 
           <!-- 物料卡片列表 -->
           <div v-loading="materialLoading">
-            <!-- <div v-if="materialCoilList.length === 0" class="empty-state">
-              <i class="el-icon-box"></i>
-              <p>暂无待领物料</p>
-            </div> -->
-
             <KLPTable :data="materialCoilList" height="calc(100vh - 340px)" :floatLayer="true" :floatLayerConfig="floatLayerConfig">
               <el-table-column prop="currentCoilNo" label="当前钢卷号">
                 <template slot-scope="scope">
@@ -52,7 +47,6 @@
                 <template slot-scope="scope">
                    <el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
                     size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
-                  <!-- <i class="el-icon-view param-icon" @click="handlePreviewLabel(scope.row)" title="查看标签"></i> -->
                   <el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
                     size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
                   <el-button v-if="useSpecialSplit" :style="splitButtonStyle" icon="el-icon-scissors" size="mini"
@@ -66,28 +60,7 @@
                   </el-button>
                 </template>
               </el-table-column>
-
             </KLPTable>
-
-            <!-- <coil-card v-for="(item, index) in materialCoilList" :key="item.coilId || index" :coil="item"
-              :card-style="{ border: item.abnormalCount > 0 ? '1px solid red' : ' 1px solid #e4e7ed' }">
-              <template slot="header">
-                <i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
-                <el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="text"
-                  size="mini" @click="handlePrintLabel(item)" title="打印标签">打印</el-button>
-              </template>
-              <template slot="footer">
-                <el-button v-if="useSpecialSplit" :style="splitButtonStyle" icon="el-icon-scissors" size="mini"
-                  @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">加工</el-button>
-                <el-button v-else type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
-                  :loading="buttonLoading" class="action-btn">领料</el-button>
-                <el-button type="danger" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
-                  @click="handleAddAbnormal(item)" :loading="buttonLoading" class="action-btn">
-                  缺陷明细
-                  <span v-if="item.abnormalCount > 0">({{ item.abnormalCount }})</span>
-                </el-button>
-              </template>
-            </coil-card> -->
           </div>
 
           <!-- 分页 -->
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index e22cefc8..1bfcb71b 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -116,7 +116,7 @@
                 <el-input v-model="splitForm.chromePlateCoilNo" placeholder="请输入镀铬卷号" />
               </el-form-item>
               <el-form-item label="当前钢卷号" prop="currentCoilNo">
-                <el-input v-model="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
+                <el-input v-model.trim="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
                 <current-coil-no :current-coil-no="splitForm.currentCoilNo" />
               </el-form-item>
               <el-form-item label="所在库位" prop="warehouseId">
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 628b222d..54507a73 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -116,7 +116,7 @@
               <el-form size="small" label-width="80px">
                 <div class="form-row">
                   <el-form-item label="卷号" required class="form-item-half">
-                    <el-input v-model="item.currentCoilNo" placeholder="输入子卷卷号" :disabled="readonly"></el-input>
+                    <el-input v-model.trim="item.currentCoilNo" placeholder="输入子卷卷号" :disabled="readonly"></el-input>
                     <current-coil-no :current-coil-no="item.currentCoilNo" />
                   </el-form-item>
                   <el-form-item label="班组" required class="form-item-half">
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index bc682c53..8293211b 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -56,7 +56,7 @@
             <el-row>
               <el-col :span="16">
                 <el-form-item label="当前钢卷号" prop="currentCoilNo">
-                  <el-input v-model="updateForm.currentCoilNo" placeholder="请输入当前钢卷号">
+                  <el-input v-model.trim="updateForm.currentCoilNo" placeholder="请输入当前钢卷号">
                     <template slot="prepend">
                       <i class="el-icon-document"></i> <current-coil-no
                         :current-coil-no="updateForm.currentCoilNo"></current-coil-no>
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index 81174d9b..2c807bd4 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -121,6 +121,7 @@
 <script>
 import { listProduct, getProduct, delProduct, updateProduct, addProductWithBom } from "@/api/wms/product";
 import UserSelect from '@/components/KLPService/UserSelect';
+import { validSpecification } from '@/utils/validate';
 
 export default {
   name: "Product",
@@ -185,6 +186,10 @@ export default {
         // owner: [
         //   { required: true, message: "负责人不能为空", trigger: "blur" }
         // ],
+        specification: [
+          { required: true, message: "规格不能为空", trigger: "blur" },
+          { validator: validSpecification, trigger: 'blur' }
+        ],
       },
       bomDialogVisible: false,
       bomId: undefined,
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index bee4a1ab..654b0af2 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -161,6 +161,7 @@
 
 <script>
 import { listRawMaterial, getRawMaterial, delRawMaterial, updateRawMaterial, addRawMaterialWithBom } from "@/api/wms/rawMaterial";
+import { validSpecification } from '@/utils/validate';
 
 export default {
   name: "RawMaterial",
@@ -233,6 +234,10 @@ export default {
         unit: [
           { required: true, message: "计量单位不能为空", trigger: "blur" }
         ],
+        specification: [
+          { required: true, message: "规格不能为空", trigger: "blur" },
+          { validator: validSpecification, trigger: 'blur' }
+        ],
       },
       paramDialogVisible: false,
       paramRow: null,