From bbbe7cefd8637c1ff809aaeafbb806950aa255a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 14 Nov 2025 09:49:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=93=81=E9=92=A2=E5=8D=B7=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E3=80=81=E5=88=87=E8=BE=B9?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=E7=AD=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在钢卷管理的分条、合卷和基础信息页面中，为成品类型的钢卷新增质量状态、切边要求、打包状态和包装要求字段
同时移除未使用的采购计划相关代码
---
 klp-ui/src/api/wms/purchasePlan.js        |  61 -------
 klp-ui/src/views/wms/coil/merge.vue       | 195 +++++++++-------------
 klp-ui/src/views/wms/coil/panels/base.vue |  76 ++++++---
 klp-ui/src/views/wms/coil/split.vue       | 189 +++++++++------------
 klp-ui/src/views/wms/coil/typing.vue      |  90 +++++-----
 klp-ui/src/views/wms/print/index-auto.vue |   1 -
 6 files changed, 266 insertions(+), 346 deletions(-)
 delete mode 100644 klp-ui/src/api/wms/purchasePlan.js

diff --git a/klp-ui/src/api/wms/purchasePlan.js b/klp-ui/src/api/wms/purchasePlan.js
deleted file mode 100644
index fde8b48d..00000000
--- a/klp-ui/src/api/wms/purchasePlan.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import request from '@/utils/request'
-
-// 查询采购计划主列表
-export function listPurchasePlan(query) {
-  return request({
-    url: '/wms/purchasePlan/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询采购计划主详细
-export function getPurchasePlan(planId) {
-  return request({
-    url: '/wms/purchasePlan/' + planId,
-    method: 'get'
-  })
-}
-
-// 新增采购计划主
-export function addPurchasePlan(data) {
-  return request({
-    url: '/wms/purchasePlan',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改采购计划主
-export function updatePurchasePlan(data) {
-  return request({
-    url: '/wms/purchasePlan',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除采购计划主
-export function delPurchasePlan(planId) {
-  return request({
-    url: '/wms/purchasePlan/' + planId,
-    method: 'delete'
-  })
-}
-
-// 获取推荐的采购计划
-export function recommendPurchasePlan(orderId) {
-  return request({
-    url: '/wms/purchasePlan/recommend/' + orderId,
-    method: 'get'
-  })
-}
-
-// 创建采购计划（含明细）
-export function createPurchasePlan(data) {
-  return request({
-    url: '/wms/purchasePlan/addWithDetails',
-    method: 'post',
-    data
-  })
-}
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index b42d17c6..caafafd0 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -28,14 +28,8 @@
               <div class="source-info">
                 <div class="source-id">{{ item.currentCoilNo || '待选择' }}</div>
               </div>
-              <el-button
-                v-if="!readonly"
-                type="text"
-                size="mini"
-                icon="el-icon-delete"
-                @click="removeSourceCoil(index)"
-                class="btn-remove"
-              ></el-button>
+              <el-button v-if="!readonly" type="text" size="mini" icon="el-icon-delete" @click="removeSourceCoil(index)"
+                class="btn-remove"></el-button>
             </div>
             <div class="source-coil-body">
               <template v-if="item.coilId">
@@ -59,7 +53,7 @@
                   <span class="detail-label">物料规格：</span>
                   <span class="detail-value">{{ item.specification }}</span>
                 </div>
-                
+
                 <!-- 参数参数展示 -->
                 <template v-if="item.bomItems && item.bomItems.length > 0">
                   <div class="source-detail-divider">参数参数</div>
@@ -76,12 +70,8 @@
               <template v-else-if="index === 1 && !readonly">
                 <div class="pending-list-title">待合卷钢卷列表</div>
                 <div class="pending-coil-list" v-if="pendingMergeList.length > 0">
-                  <div
-                    class="pending-coil-item"
-                    v-for="pending in pendingMergeList"
-                    :key="pending.actionId"
-                    @click="selectPendingCoil(pending, index)"
-                  >
+                  <div class="pending-coil-item" v-for="pending in pendingMergeList" :key="pending.actionId"
+                    @click="selectPendingCoil(pending, index)">
                     <div class="pending-coil-no">{{ pending.currentCoilNo }}</div>
                     <div class="pending-coil-info">
                       <span class="pending-label">扫码时间：</span>
@@ -110,19 +100,10 @@
         <div class="merge-arrow-container">
           <svg width="120" height="100%" viewBox="0 0 120 400" xmlns="http://www.w3.org/2000/svg">
             <!-- 多条线汇聚到一点 -->
-            <line
-              v-for="(item, index) in sourceCoils"
-              :key="index"
-              :x1="0"
-              :y1="50 + index * 80"
-              :x2="100"
-              :y2="200"
-              stroke="#0066cc"
-              stroke-width="2"
-              stroke-dasharray="5,5"
-            />
+            <line v-for="(item, index) in sourceCoils" :key="index" :x1="0" :y1="50 + index * 80" :x2="100" :y2="200"
+              stroke="#0066cc" stroke-width="2" stroke-dasharray="5,5" />
             <!-- 箭头 -->
-            <polygon points="100,200 110,195 110,205" fill="#0066cc"/>
+            <polygon points="100,200 110,195 110,205" fill="#0066cc" />
           </svg>
         </div>
         <div class="flow-label">
@@ -148,79 +129,69 @@
                 <el-input v-model="targetCoil.team" placeholder="请输入班组名称" :disabled="readonly"></el-input>
               </el-form-item>
               <el-form-item label="材料类型">
-                <el-select 
-                  v-model="targetCoil.materialType" 
-                  placeholder="请选择材料类型" 
-                  style="width: 100%" 
-                  :disabled="readonly"
-                  @change="handleMaterialTypeChange">
+                <el-select v-model="targetCoil.materialType" placeholder="请选择材料类型" style="width: 100%"
+                  :disabled="readonly" @change="handleMaterialTypeChange">
                   <el-option label="原料" value="原料" />
                   <el-option label="成品" value="成品" />
                   <el-option label="废品" value="废品" />
                 </el-select>
               </el-form-item>
               <!-- 物品类型由材料类型自动联动，隐藏此选择框 -->
-              
+
+              <el-form-item v-if="targetCoil.materialType === '成品'" label="质量状态" prop="qualityStatus">
+                <el-input v-model="targetCoil.qualityStatus"
+                  placeholder="请输入质量状态" :disabled="readonly">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item v-if="targetCoil.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+                <el-input v-model="targetCoil.trimmingRequirement"
+                  placeholder="请输入切边要求" :disabled="readonly">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item v-if="targetCoil.materialType === '成品'" label="打包状态" prop="packingStatus">
+                <el-input v-model="targetCoil.packingStatus"
+                  placeholder="请输入打包状态" :disabled="readonly">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item v-if="targetCoil.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+                <el-input v-model="targetCoil.packagingRequirement"
+                  placeholder="请输入包装要求" :disabled="readonly">
+                </el-input>
+              </el-form-item>
+
               <el-form-item :label="getItemLabel">
-                <el-select 
-                  v-model="targetCoil.itemId" 
-                  :placeholder="getItemPlaceholder"
-                  filterable
-                  remote
-                  :remote-method="searchItems"
-                  :loading="itemSearchLoading"
-                  style="width: 100%"
-                  :disabled="readonly || !targetCoil.materialType"
-                >
-                  <el-option
-                    v-for="item in currentItemList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
+                <el-select v-model="targetCoil.itemId" :placeholder="getItemPlaceholder" filterable remote
+                  :remote-method="searchItems" :loading="itemSearchLoading" style="width: 100%"
+                  :disabled="readonly || !targetCoil.materialType">
+                  <el-option v-for="item in currentItemList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
 
               <el-form-item label="毛重(t)">
-                <el-input
-                  v-model.number="targetCoil.grossWeight"
-                  placeholder="请输入毛重"
-                  type="number"
-                  step="0.01"
-                  :disabled="readonly"
-                >
+                <el-input v-model.number="targetCoil.grossWeight" placeholder="请输入毛重" type="number" step="0.01"
+                  :disabled="readonly">
                   <template slot="append">吨</template>
                 </el-input>
               </el-form-item>
               <el-form-item label="净重(t)">
-                <el-input
-                  v-model.number="targetCoil.netWeight"
-                  placeholder="请输入净重"
-                  type="number"
-                  step="0.01"
-                  :disabled="readonly"
-                >
+                <el-input v-model.number="targetCoil.netWeight" placeholder="请输入净重" type="number" step="0.01"
+                  :disabled="readonly">
                   <template slot="append">吨</template>
                 </el-input>
               </el-form-item>
               <el-form-item label="逻辑库区">
-                <el-select v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable :disabled="readonly">
-                  <el-option
-                    v-for="warehouse in warehouseList"
-                    :key="warehouse.warehouseId"
-                    :label="warehouse.warehouseName"
-                    :value="warehouse.warehouseId"
-                  />
+                <el-select v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable
+                  :disabled="readonly">
+                  <el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseId"
+                    :label="warehouse.warehouseName" :value="warehouse.warehouseId" />
                 </el-select>
               </el-form-item>
               <el-form-item label="真实库区">
-                <actual-warehouse-select
-                  v-model="targetCoil.actualWarehouseId"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  clearable
-                  :disabled="readonly"
-                />
+                <actual-warehouse-select v-model="targetCoil.actualWarehouseId" placeholder="请选择" style="width: 100%"
+                  clearable :disabled="readonly" />
               </el-form-item>
             </el-form>
           </div>
@@ -242,10 +213,7 @@
     </div>
 
     <!-- 钢卷选择器 -->
-    <coil-selector
-      :visible.sync="coilSelectorVisible"
-      @select="handleCoilSelect"
-    />
+    <coil-selector :visible.sync="coilSelectorVisible" @select="handleCoilSelect" />
   </div>
 </template>
 
@@ -405,7 +373,7 @@ export default {
     handleMaterialTypeChange(value) {
       // 清空物品选择
       this.$set(this.targetCoil, 'itemId', null);
-      
+
       // 根据材料类型设置物品类型并恢复完整列表
       if (value === '成品') {
         this.$set(this.targetCoil, 'itemType', 'product');
@@ -417,7 +385,7 @@ export default {
         this.rawMaterialList = [...this.allRawMaterials];
       }
     },
-    
+
     // 加载第一个钢卷（从待操作进入时）
     async loadFirstCoil(coilId) {
       try {
@@ -479,7 +447,7 @@ export default {
     async loadPendingMergeList() {
       try {
         this.pendingLoading = true;
-        
+
         // 分别查询待处理和处理中的记录
         const responses = await Promise.all([
           listPendingAction({
@@ -495,16 +463,16 @@ export default {
             pageSize: 1000
           })
         ]);
-        
+
         // 合并两个列表
         const allPending = [
           ...(responses[0].rows || []),
           ...(responses[1].rows || [])
         ];
-        
+
         // 排除当前钢卷
         const currentCoilId = this.sourceCoils[0] ? this.sourceCoils[0].coilId : null;
-        
+
         this.pendingMergeList = allPending.filter(item => item.coilId !== currentCoilId);
       } catch (error) {
         console.error('加载待合卷列表失败', error);
@@ -559,35 +527,35 @@ export default {
     // 格式化物品名称（添加规格和参数信息）
     formatItemName(item) {
       if (!item) return '';
-      
+
       // 获取名称（原材料或产品）
       const name = item.rawMaterialName || item.productName || '';
       if (!name) return '';
-      
+
       let displayName = name;
       const specs = [];
-      
+
       // 1. 优先显示规格（从对象的specification字段）
       if (item.specification) {
         specs.push(item.specification);
       }
-      
+
       // 2. 添加参数参数（最多2个）
       if (item.bomItems && item.bomItems.length > 0) {
         const bomParams = item.bomItems
           .filter(bomItem => bomItem.attrKey && bomItem.attrValue)
           .slice(0, 2);  // 最多2个参数参数
-        
+
         bomParams.forEach(param => {
           specs.push(`${param.attrKey}:${param.attrValue}`);
         });
       }
-      
+
       // 3. 拼接成最终格式
       if (specs.length > 0) {
         displayName += `（${specs.join(' ')}）`;
       }
-      
+
       return displayName;
     },
 
@@ -631,12 +599,12 @@ export default {
       if (!itemType) {
         return;
       }
-      
+
       try {
         this.itemSearchLoading = true;
         if (itemType === 'raw_material') {
-          const response = await listRawMaterial({ 
-            pageNum: 1, 
+          const response = await listRawMaterial({
+            pageNum: 1,
             pageSize: 100,
             withBom: true
           });
@@ -644,8 +612,8 @@ export default {
             this.rawMaterialList = response.rows || [];
           }
         } else if (itemType === 'product') {
-          const response = await listProduct({ 
-            pageNum: 1, 
+          const response = await listProduct({
+            pageNum: 1,
             pageSize: 100,
             withBom: true
           });
@@ -666,7 +634,7 @@ export default {
         this.$message.warning('请先选择材料类型');
         return;
       }
-      
+
       // 如果没有输入，恢复完整列表
       if (!query || query.trim() === '') {
         if (this.targetCoil.itemType === 'raw_material') {
@@ -676,10 +644,10 @@ export default {
         }
         return;
       }
-      
+
       // 前端过滤：在已加载的数据中搜索
       const searchQuery = query.toLowerCase().trim();
-      
+
       if (this.targetCoil.itemType === 'raw_material') {
         // 从备份列表中过滤原材料
         this.rawMaterialList = this.allRawMaterials.filter(item => {
@@ -688,11 +656,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       } else if (this.targetCoil.itemType === 'product') {
@@ -703,11 +671,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       }
@@ -837,7 +805,7 @@ export default {
           text: '正在合卷，请稍后...',
           background: 'rgba(0, 0, 0, 0.7)'
         });
-        
+
         const response = await mergeMaterialCoil(mergeData);
         if (response.code === 200) {
           this.$message.success('合卷保存成功');
@@ -1123,17 +1091,17 @@ export default {
   align-items: flex-start;
   margin-bottom: 8px;
   font-size: 13px;
-  
+
   &:last-child {
     margin-bottom: 0;
   }
-  
+
   .detail-label {
     color: #909399;
     min-width: 90px;
     flex-shrink: 0;
   }
-  
+
   .detail-value {
     color: #303133;
     flex: 1;
@@ -1159,12 +1127,12 @@ export default {
   align-items: center;
   margin-bottom: 6px;
   font-size: 12px;
-  
+
   .bom-key {
     color: #909399;
     min-width: 60px;
   }
-  
+
   .bom-value {
     color: #303133;
     flex: 1;
@@ -1288,4 +1256,3 @@ export default {
   }
 }
 </style>
-
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index bb6edcc2..792c3977 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -16,10 +16,12 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="所在库位" prop="warehouseId" v-if="!hideWarehouseQuery">
-        <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%; display: inline-block;" clearable />
+        <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+          style="width: 100%; display: inline-block;" clearable />
       </el-form-item>
       <el-form-item label="实际库区" prop="actualWarehouseId" v-if="!hideWarehouseQuery">
-        <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位" style="width: 100%; display: inline-block;" clearable />
+        <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位"
+          style="width: 100%; display: inline-block;" clearable />
       </el-form-item>
       <el-form-item label="厂家卷号" prop="supplierCoilNo">
         <el-input v-model="queryParams.supplierCoilNo" placeholder="请输入厂家原料卷号" clearable
@@ -27,21 +29,22 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)" :label="item.label" />
+          <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)"
+            :label="item.label" />
         </el-select>
       </el-form-item>
 
-      <MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType" :multiple="true"/>
+      <MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType"
+        :multiple="true" />
 
       <el-form-item label="班组" prop="team">
-        <el-input v-model="queryParams.team" placeholder="请输入班组" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.team" placeholder="请输入班组" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="更新时间" prop="updateTime">
         <el-date-picker size="mini" v-model="queryParams.updateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-     
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,14 +74,14 @@
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
       <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" />
       <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
-      <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
-      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery" />
       <!-- <el-table-column label="物料类型" align="center" prop="itemType">
         <template slot-scope="scope">
           {{ scope.row.itemType  == 'raw_material' ? '原料' : '产品' }}
         </template>
-      </el-table-column> -->
-      <el-table-column label="物料类型" align="center" prop="materialType"/>
+</el-table-column> -->
+      <el-table-column label="物料类型" align="center" prop="materialType" />
       <el-table-column label="产品类型" align="center" prop="itemName">
         <template slot-scope="scope">
           <ProductInfo v-if="scope.row.itemType == 'product'" :productId="scope.row.itemId">
@@ -100,7 +103,7 @@
       </el-table-column> -->
       <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      
+
       <el-table-column label="二维码" v-if="qrcode">
         <template slot-scope="scope">
           <QRCode :content="scope.row.qrcodeRecordId" :size="50" />
@@ -109,7 +112,8 @@
       <el-table-column label="状态" v-if="showStatus" align="center" prop="status">
         <template slot-scope="scope">
           <el-select v-model="scope.row.status" placeholder="请选择状态" @change="handleStatusChange(scope.row)">
-            <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)" :label="item.label" />
+            <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)"
+              :label="item.label" />
           </el-select>
         </template>
       </el-table-column>
@@ -162,7 +166,8 @@
           <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
         </el-form-item>
         <el-form-item label="实际库区" prop="actualWarehouseId">
-          <actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;" clearable />
+          <actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;"
+            clearable />
         </el-form-item>
         <el-form-item label="班组" prop="team">
           <el-input v-model="form.team" placeholder="请输入班组" />
@@ -181,13 +186,36 @@
             style="width: 100%;" clearable />
           <div v-else>请先选择材料类型</div>
         </el-form-item> -->
+        <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
+          <el-input v-model="form.qualityStatus" placeholder="请输入质量状态"
+            :disabled="readonly">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+          <el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求"
+            :disabled="readonly">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
+          <el-input v-model="form.packingStatus" placeholder="请输入打包状态"
+            :disabled="readonly">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+          <el-input v-model="form.packagingRequirement" placeholder="请输入包装要求"
+            :disabled="readonly">
+          </el-input>
+        </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
           <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
         </el-form-item>
         <el-form-item label="净重" prop="netWeight">
           <el-input v-model="form.netWeight" placeholder="请输入净重" />
         </el-form-item>
-         <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
@@ -357,7 +385,7 @@ export default {
         return '原料类型';
       }
       return '物品类型';
-    }
+    },
   },
   created() {
     this.getList();
@@ -367,7 +395,7 @@ export default {
     handleMaterialTypeChange(value) {
       // 清空物品选择
       this.form.itemId = null;
-      
+
       // 根据材料类型设置物品类型
       if (value === '成品') {
         this.form.itemType = 'product';
@@ -378,7 +406,7 @@ export default {
     /** 查询钢卷物料列表 */
     getList() {
       this.loading = true;
-      const { updateTime ,...query } = {
+      const { updateTime, ...query } = {
         ...this.queryParams,
         startTime: this.queryParams.updateTime?.[0],
         endTime: this.queryParams.updateTime?.[1],
@@ -504,7 +532,7 @@ export default {
     handleAdd() {
       this.isCheck = false;
       this.reset();
-      
+
       // 如果父组件传入了 materialType，使用它作为默认值
       if (this.querys.materialType) {
         this.form.materialType = this.querys.materialType;
@@ -515,7 +543,7 @@ export default {
           this.form.itemType = 'raw_material';
         }
       }
-      
+
       this.open = true;
       this.title = "添加钢卷物料";
     },
@@ -528,7 +556,7 @@ export default {
       getMaterialCoil(coilId).then(response => {
         this.loading = false;
         this.form = response.data;
-        
+
         // 设置 materialType（优先级：后端返回 > itemType推断 > 父组件传入）
         if (!this.form.materialType) {
           if (this.form.itemType) {
@@ -549,7 +577,7 @@ export default {
             }
           }
         }
-        
+
         this.open = true;
         this.title = "修改钢卷物料";
       });
@@ -562,7 +590,7 @@ export default {
       getMaterialCoil(coilId).then(response => {
         this.loading = false;
         this.form = response.data;
-        
+
         // 设置 materialType（优先级：后端返回 > itemType推断 > 父组件传入）
         if (!this.form.materialType) {
           if (this.form.itemType) {
@@ -583,7 +611,7 @@ export default {
             }
           }
         }
-        
+
         this.open = true;
         this.title = "修改钢卷物料";
       });
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 32db8884..997bab7c 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -88,8 +88,10 @@
         <div class="flow-section-title">
           <span>子卷列表</span>
           <div>
-            <el-button v-if="!readonly" type="text" size="mini" @click="copyToAllSubCoils" icon="el-icon-document-copy">复制到全部</el-button>
-            <el-button v-if="!readonly" type="text" size="mini" @click="addSplitItem" icon="el-icon-plus">添加子卷</el-button>
+            <el-button v-if="!readonly" type="text" size="mini" @click="copyToAllSubCoils"
+              icon="el-icon-document-copy">复制到全部</el-button>
+            <el-button v-if="!readonly" type="text" size="mini" @click="addSplitItem"
+              icon="el-icon-plus">添加子卷</el-button>
           </div>
         </div>
 
@@ -97,14 +99,8 @@
           <div class="sub-coil-card" v-for="(item, index) in splitList" :key="index">
             <div class="sub-coil-header">
               <span class="sub-coil-number">{{ index + 1 }}</span>
-              <el-button
-                v-if="!readonly"
-                type="text"
-                size="mini"
-                icon="el-icon-delete"
-                @click="removeSplitItem(index)"
-                class="btn-remove"
-              ></el-button>
+              <el-button v-if="!readonly" type="text" size="mini" icon="el-icon-delete" @click="removeSplitItem(index)"
+                class="btn-remove"></el-button>
             </div>
             <div class="sub-coil-body">
               <el-form size="small" label-width="90px">
@@ -116,11 +112,7 @@
                 </el-form-item>
 
                 <el-form-item label="材料类型" required>
-                  <el-select 
-                    v-model="item.materialType" 
-                    placeholder="请选择材料类型" 
-                    style="width: 100%" 
-                    :disabled="readonly"
+                  <el-select v-model="item.materialType" placeholder="请选择材料类型" style="width: 100%" :disabled="readonly"
                     @change="handleMaterialTypeChange(item, index)">
                     <el-option label="原料" value="原料" />
                     <el-option label="成品" value="成品" />
@@ -128,75 +120,62 @@
                   </el-select>
                 </el-form-item>
 
+                <el-form-item v-if="updateForm.materialType === '成品'" label="质量状态" prop="qualityStatus">
+                  <el-input v-model="item.qualityStatus" placeholder="请输入质量状态"
+                    :disabled="readonly">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item v-if="updateForm.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+                  <el-input v-model="item.trimmingRequirement" placeholder="请输入切边要求"
+                    :disabled="readonly">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item v-if="updateForm.materialType === '成品'" label="打包状态" prop="packingStatus">
+                  <el-input v-model="item.packingStatus" placeholder="请输入打包状态"
+                    :disabled="readonly">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item v-if="updateForm.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+                  <el-input v-model="item.packagingRequirement" placeholder="请输入包装要求"
+                    :disabled="readonly">
+                  </el-input>
+                </el-form-item>
+
                 <!-- 物品类型由材料类型自动决定，不显示选择框 -->
-                <el-form-item 
-                  :label="getItemLabel(item.materialType)" 
-                  :required="item.materialType !== '废品'">
-                  <el-select
-                    v-model="item.itemId"
-                    :placeholder="getItemPlaceholder(item.materialType)"
-                    filterable
-                    remote
-                    :remote-method="(query) => searchItemsForSplit(query, index)"
-                    :loading="itemSearchLoading"
-                    style="width: 100%"
-                    :disabled="readonly || !item.materialType"
-                  >
-                    <el-option
-                      v-for="option in getItemListForSplit(item.itemType)"
-                      :key="option.id"
-                      :label="option.name"
-                      :value="option.id"
-                    />
+                <el-form-item :label="getItemLabel(item.materialType)" :required="item.materialType !== '废品'">
+                  <el-select v-model="item.itemId" :placeholder="getItemPlaceholder(item.materialType)" filterable
+                    remote :remote-method="(query) => searchItemsForSplit(query, index)" :loading="itemSearchLoading"
+                    style="width: 100%" :disabled="readonly || !item.materialType">
+                    <el-option v-for="option in getItemListForSplit(item.itemType)" :key="option.id"
+                      :label="option.name" :value="option.id" />
                   </el-select>
                 </el-form-item>
-                
+
                 <el-form-item label="毛重(t)" required>
-                  <el-input
-                    v-model.number="item.grossWeight"
-                    placeholder="请输入毛重"
-                    type="number"
-                    step="0.01"
-                    :disabled="readonly"
-                  >
+                  <el-input v-model.number="item.grossWeight" placeholder="请输入毛重" type="number" step="0.01"
+                    :disabled="readonly">
                     <template slot="append">吨</template>
                   </el-input>
                 </el-form-item>
                 <el-form-item label="净重(t)" required>
-                  <el-input
-                    v-model.number="item.netWeight"
-                    placeholder="请输入净重"
-                    type="number"
-                    step="0.01"
-                    :disabled="readonly"
-                  >
+                  <el-input v-model.number="item.netWeight" placeholder="请输入净重" type="number" step="0.01"
+                    :disabled="readonly">
                     <template slot="append">吨</template>
                   </el-input>
                 </el-form-item>
                 <el-form-item label="逻辑库区" required>
-                  <el-select
-                    v-model="item.warehouseId"
-                    placeholder="请选择逻辑库区"
-                    style="width: 100%"
-                    filterable
-                    :disabled="readonly"
-                  >
-                    <el-option
-                      v-for="warehouse in warehouseList"
-                      :key="warehouse.warehouseId"
-                      :label="warehouse.warehouseName"
-                      :value="warehouse.warehouseId"
-                    />
+                  <el-select v-model="item.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable
+                    :disabled="readonly">
+                    <el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseId"
+                      :label="warehouse.warehouseName" :value="warehouse.warehouseId" />
                   </el-select>
                 </el-form-item>
                 <el-form-item label="真实库区" required>
-                  <ActualWarehouseSelect
-                    v-model="item.actualWarehouseId"
-                    placeholder="请选择真实库区"
-                    style="width: 100%"
-                    filterable
-                    :disabled="readonly"
-                  />
+                  <ActualWarehouseSelect v-model="item.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
+                    filterable :disabled="readonly" />
                 </el-form-item>
               </el-form>
             </div>
@@ -214,10 +193,7 @@
     </div>
 
     <!-- 钢卷选择器 -->
-    <coil-selector
-      :visible.sync="coilSelectorVisible"
-      @select="handleCoilSelect"
-    />
+    <coil-selector :visible.sync="coilSelectorVisible" @select="handleCoilSelect" />
   </div>
 </template>
 
@@ -299,16 +275,16 @@ export default {
     const coilId = this.$route.query.coilId;
     const actionId = this.$route.query.actionId;
     const readonly = this.$route.query.readonly;
-    
+
     if (coilId) {
       await this.loadMotherCoil(coilId);
     }
-    
+
     // 保存待操作ID
     if (actionId) {
       this.actionId = actionId;
     }
-    
+
     // 设置只读模式
     if (readonly === 'true' || readonly === true) {
       this.readonly = true;
@@ -319,7 +295,7 @@ export default {
     handleMaterialTypeChange(item, index) {
       // 清空物品选择
       this.$set(item, 'itemId', null);
-      
+
       // 根据材料类型设置物品类型并恢复完整列表
       if (item.materialType === '成品') {
         this.$set(item, 'itemType', 'product');
@@ -331,7 +307,7 @@ export default {
         this.rawMaterialList = [...this.allRawMaterials];
       }
     },
-    
+
     // 动态获取标签
     getItemLabel(materialType) {
       if (materialType === '成品') {
@@ -371,35 +347,35 @@ export default {
     // 格式化物品名称（添加规格和参数信息）
     formatItemName(item) {
       if (!item) return '';
-      
+
       // 获取名称（原材料或产品）
       const name = item.rawMaterialName || item.productName || '';
       if (!name) return '';
-      
+
       let displayName = name;
       const specs = [];
-      
+
       // 1. 优先显示规格（从对象的specification字段）
       if (item.specification) {
         specs.push(item.specification);
       }
-      
+
       // 2. 添加参数参数（最多2个）
       if (item.bomItems && item.bomItems.length > 0) {
         const bomParams = item.bomItems
           .filter(bomItem => bomItem.attrKey && bomItem.attrValue)
           .slice(0, 2);  // 最多2个参数参数
-        
+
         bomParams.forEach(param => {
           specs.push(`${param.attrKey}:${param.attrValue}`);
         });
       }
-      
+
       // 3. 拼接成最终格式
       if (specs.length > 0) {
         displayName += `（${specs.join(' ')}）`;
       }
-      
+
       return displayName;
     },
 
@@ -412,13 +388,13 @@ export default {
     // 搜索子卷物品（前端过滤，支持名称和规格搜索）
     async searchItemsForSplit(query, index) {
       const item = this.splitList[index];
-      
+
       const itemType = item.itemType;
       if (!itemType) {
         this.$message.warning('请先选择材料类型');
         return;
       }
-      
+
       // 如果没有输入，恢复完整列表
       if (!query || query.trim() === '') {
         if (itemType === 'raw_material') {
@@ -428,10 +404,10 @@ export default {
         }
         return;
       }
-      
+
       // 前端过滤：在已加载的数据中搜索
       const searchQuery = query.toLowerCase().trim();
-      
+
       if (itemType === 'raw_material') {
         // 从备份列表中过滤原材料
         this.rawMaterialList = this.allRawMaterials.filter(item => {
@@ -440,11 +416,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       } else if (itemType === 'product') {
@@ -455,11 +431,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       }
@@ -493,12 +469,12 @@ export default {
       if (!itemType) {
         return;
       }
-      
+
       try {
         this.itemSearchLoading = true;
         if (itemType === 'raw_material') {
-          const response = await listRawMaterial({ 
-            pageNum: 1, 
+          const response = await listRawMaterial({
+            pageNum: 1,
             pageSize: 100,
             withBom: true
           });
@@ -506,8 +482,8 @@ export default {
             this.rawMaterialList = response.rows || [];
           }
         } else if (itemType === 'product') {
-          const response = await listProduct({ 
-            pageNum: 1, 
+          const response = await listProduct({
+            pageNum: 1,
             pageSize: 100,
             withBom: true
           });
@@ -661,11 +637,11 @@ export default {
         }
       }
 
-       const loadingInstance = this.$loading({
-          lock: true,
-          text: '正在分条，请稍后...',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+      const loadingInstance = this.$loading({
+        lock: true,
+        text: '正在分条，请稍后...',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
 
       try {
         this.loading = true;
@@ -694,12 +670,12 @@ export default {
         const response = await splitMaterialCoil(splitData);
         if (response.code === 200) {
           this.$message.success('分条保存成功');
-          
+
           // 如果是从待操作列表进来的，标记操作为完成
           if (this.actionId) {
             await completeAction(this.actionId);
           }
-          
+
           // 延迟返回，让用户看到成功提示
           setTimeout(() => {
             this.$router.back();
@@ -707,7 +683,7 @@ export default {
         } else {
           this.$message.error(response.msg || '分条保存失败');
         }
-       
+
       } catch (error) {
         this.$message.error('分条保存失败');
         console.error(error);
@@ -1107,4 +1083,3 @@ export default {
   }
 }
 </style>
-
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index b5c0266f..6cd1bbf8 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -94,12 +94,8 @@
             </el-form-item>
 
             <el-form-item label="材料类型" prop="materialType">
-              <el-select 
-                v-model="updateForm.materialType" 
-                placeholder="请选择材料类型" 
-                style="width: 100%" 
-                :disabled="readonly"
-                @change="handleMaterialTypeChange">
+              <el-select v-model="updateForm.materialType" placeholder="请选择材料类型" style="width: 100%"
+                :disabled="readonly" @change="handleMaterialTypeChange">
                 <el-option label="原料" value="原料" />
                 <el-option label="成品" value="成品" />
                 <el-option label="废品" value="废品" />
@@ -107,19 +103,35 @@
             </el-form-item>
 
             <!-- 物品类型由材料类型自动决定，不显示选择框 -->
-            
-            <el-form-item 
-              :label="getItemLabel" 
-              :prop="updateForm.materialType === '废品' ? '' : 'itemId'"
+
+            <el-form-item v-if="updateForm.materialType === '成品'" label="质量状态" prop="qualityStatus">
+              <el-input  v-model="updateForm.qualityStatus" placeholder="请输入质量状态"
+                :disabled="readonly">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item v-if="updateForm.materialType === '成品'" label="切边要求" prop="qualityStatus">
+              <el-input v-model="updateForm.trimmingRequirement" placeholder="请输入切边要求"
+                :disabled="readonly">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item v-if="updateForm.materialType === '成品'" label="打包状态" prop="qualityStatus">
+              <el-input v-model="updateForm.packingStatus" placeholder="请输入打包状态"
+                :disabled="readonly">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item v-if="updateForm.materialType === '成品'" label="包装要求" prop="qualityStatus">
+              <el-input v-model="updateForm.packagingRequirement" placeholder="请输入包装要求"
+                :disabled="readonly">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item :label="getItemLabel" :prop="updateForm.materialType === '废品' ? '' : 'itemId'"
               :rules="updateForm.materialType === '废品' ? [] : rules.itemId">
-              <el-select 
-                v-model="updateForm.itemId" 
-                :placeholder="getItemPlaceholder" 
-                filterable 
-                remote 
-                :remote-method="searchItems"
-                :loading="itemSearchLoading" 
-                style="width: 100%" 
+              <el-select v-model="updateForm.itemId" :placeholder="getItemPlaceholder" filterable remote
+                :remote-method="searchItems" :loading="itemSearchLoading" style="width: 100%"
                 :disabled="readonly || !updateForm.materialType">
                 <el-option v-for="item in currentItemList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
@@ -365,7 +377,7 @@ export default {
     handleMaterialTypeChange(value) {
       // 清空物品选择
       this.$set(this.updateForm, 'itemId', null);
-      
+
       // 根据材料类型设置物品类型
       if (value === '成品') {
         this.$set(this.updateForm, 'itemType', 'product');
@@ -377,7 +389,7 @@ export default {
         this.rawMaterialList = [...this.allRawMaterials];
       }
     },
-    
+
     // 加载钢卷信息
     async loadCoilInfo(coilId) {
       try {
@@ -451,35 +463,35 @@ export default {
     // 格式化物品名称（添加规格和参数信息）
     formatItemName(item) {
       if (!item) return '';
-      
+
       // 获取名称（原材料或产品）
       const name = item.rawMaterialName || item.productName || '';
       if (!name) return '';
-      
+
       let displayName = name;
       const specs = [];
-      
+
       // 1. 优先显示规格（从对象的specification字段）
       if (item.specification) {
         specs.push(item.specification);
       }
-      
+
       // 2. 添加参数参数（最多2个）
       if (item.bomItems && item.bomItems.length > 0) {
         const bomParams = item.bomItems
           .filter(bomItem => bomItem.attrKey && bomItem.attrValue)
           .slice(0, 2);  // 最多2个参数参数
-        
+
         bomParams.forEach(param => {
           specs.push(`${param.attrKey}:${param.attrValue}`);
         });
       }
-      
+
       // 3. 拼接成最终格式
       if (specs.length > 0) {
         displayName += `（${specs.join(' ')}）`;
       }
-      
+
       return displayName;
     },
 
@@ -523,13 +535,13 @@ export default {
       if (!itemType) {
         return;
       }
-      
+
       try {
         this.itemSearchLoading = true;
         if (itemType === 'raw_material') {
           // 使用带参数的接口
-          const response = await listRawMaterial({ 
-            pageNum: 1, 
+          const response = await listRawMaterial({
+            pageNum: 1,
             pageSize: 100,
             withBom: true  // 请求包含参数信息
           });
@@ -538,8 +550,8 @@ export default {
           }
         } else if (itemType === 'product') {
           // 使用带参数的接口
-          const response = await listProduct({ 
-            pageNum: 1, 
+          const response = await listProduct({
+            pageNum: 1,
             pageSize: 100,
             withBom: true  // 请求包含参数信息
           });
@@ -560,7 +572,7 @@ export default {
         this.$message.warning('请先选择材料类型');
         return;
       }
-      
+
       // 如果没有输入，恢复完整列表
       if (!query || query.trim() === '') {
         if (this.updateForm.itemType === 'raw_material') {
@@ -570,10 +582,10 @@ export default {
         }
         return;
       }
-      
+
       // 前端过滤：在已加载的数据中搜索
       const searchQuery = query.toLowerCase().trim();
-      
+
       if (this.updateForm.itemType === 'raw_material') {
         // 从备份列表中过滤原材料
         this.rawMaterialList = this.allRawMaterials.filter(item => {
@@ -582,11 +594,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       } else if (this.updateForm.itemType === 'product') {
@@ -597,11 +609,11 @@ export default {
           // 搜索规格
           const specMatch = item.specification && item.specification.toLowerCase().includes(searchQuery);
           // 搜索 参数 参数
-          const bomMatch = item.bomItems && item.bomItems.some(bom => 
+          const bomMatch = item.bomItems && item.bomItems.some(bom =>
             (bom.attrKey && bom.attrKey.toLowerCase().includes(searchQuery)) ||
             (bom.attrValue && bom.attrValue.toLowerCase().includes(searchQuery))
           );
-          
+
           return nameMatch || specMatch || bomMatch;
         });
       }
diff --git a/klp-ui/src/views/wms/print/index-auto.vue b/klp-ui/src/views/wms/print/index-auto.vue
index 2fa35a08..eaa81b20 100644
--- a/klp-ui/src/views/wms/print/index-auto.vue
+++ b/klp-ui/src/views/wms/print/index-auto.vue
@@ -39,7 +39,6 @@ import { listStockIo } from '@/api/wms/stockIo';
 import { listStockIoDetail } from '@/api/wms/stockIoDetail';
 import { listOrder } from '@/api/wms/order';
 import { listOrderDetail } from '@/api/wms/orderDetail';
-import { listPurchasePlan } from '@/api/wms/purchasePlan';
 import { mapState } from 'vuex';
 import { ITEM_TYPE } from '../../../utils/enums';