diff --git a/apps/hand-factory/api/wms/coil.js b/apps/hand-factory/api/wms/coil.js
index 193f592..1cd2cde 100644
--- a/apps/hand-factory/api/wms/coil.js
+++ b/apps/hand-factory/api/wms/coil.js
@@ -17,9 +17,9 @@ export function exportMaterialCoil(query) {
   })  
 }
 
-export function getMaterialCoil(CoilMaterialId) {
+export function getMaterialCoil(coilId) {
   return request({
-    url: '/wms/materialCoil/' + CoilMaterialId,
+    url: '/wms/materialCoil/' + coilId,
     method: 'get'
   })
 }
@@ -50,17 +50,21 @@ export function updateMaterialCoilSimple(data) {
 }
 
 // 删除钢卷物料表
-export function delMaterialCoil(CoilMaterialId) {
+export function delMaterialCoil(coilId) {
   return request({
-    url: '/wms/materialCoil/' + CoilMaterialId,
+    url: '/wms/materialCoil/' + coilId,
     method: 'delete'
   })
 }
 
 // 钢卷溯源查询
-export function getMaterialCoilTrace(CoilMaterialId) {
+export function getMaterialCoilTrace(enterCoilNo, currentCoilNo) {
   return request({
-    url: '/wms/materialCoil/trace/' + CoilMaterialId,
-    method: 'get'
+    url: '/wms/materialCoil/trace',
+    method: 'get',
+    params: {
+      enterCoilNo: enterCoilNo,
+      currentCoilNo: currentCoilNo
+    }
   })
 }
diff --git a/apps/hand-factory/components/panels/code/apart.vue b/apps/hand-factory/components/panels/code/apart.vue
index 384193c..e228266 100644
--- a/apps/hand-factory/components/panels/code/apart.vue
+++ b/apps/hand-factory/components/panels/code/apart.vue
@@ -1,390 +1,963 @@
 <template>
-  <view class="container">
-    <!-- 扫码按钮 -->
-    <button class="scan-btn" @click="handleScan">点击扫码</button>
-
-    <!-- 表单区域：扫码后显示 -->
-    <uni-form ref="form" v-model="form" :rules="rules" v-if="form.coilId" label-width="160rpx">
-      <!-- 分卷数量控制 -->
-      <view class="coil-control">
-        <text class="control-text">分卷数量：{{ form.newCoils.length }} 卷</text>
-        <button class="add-btn" @click="addCoil">+ 添加卷</button>
-      </view>
-
-      <!-- 动态渲染多卷表单 -->
-      <view v-for="(coil, index) in form.newCoils" :key="index" class="coil-group">
-        <!-- 卷标识 -->
-        <view class="coil-title">
-          <text>卷 {{ index + 1 }}</text>
-          <!-- 仅当卷数量大于1时显示删除按钮 -->
-          <button 
-            class="delete-btn" 
-            @click="deleteCoil(index)" 
-            v-if="form.newCoils.length > 1"
-          >
-            删除
-          </button>
-        </view>
-
-        <!-- 卷信息表单项 -->
-        <uni-form-item :label="`物料类型(${index + 1})`" :prop="`newCoils.${index}.itemType`">
-          <uni-data-checkbox 
-            v-model="coil.itemType" 
-            :localdata="[{ text: '原料', value: 'raw_material' }, { text: '产品', value: 'product' }]" 
-          />
-        </uni-form-item>
-
-        <uni-form-item :label="`原料/产品(${index + 1})`" :prop="`newCoils.${index}.itemId`">
-          <klp-product-select 
-            :item-type="coil.itemType" 
-            v-model="coil.itemId"
-          ></klp-product-select>
-        </uni-form-item>
-
-        <uni-form-item :label="`所属班组(${index + 1})`" :prop="`newCoils.${index}.team`">
-          <input 
-            v-model="coil.team" 
-            placeholder="请输入班组名称" 
-            class="input-control"
-          />
-        </uni-form-item>
-
-        <uni-form-item :label="`当前卷号(${index + 1})`" :prop="`newCoils.${index}.currentCoilNo`">
-          <input 
-            v-model="coil.currentCoilNo" 
-            placeholder="请输入卷号信息" 
-            class="input-control"
-          />
-        </uni-form-item>
-
-        <uni-form-item :label="`毛重(kg)(${index + 1})`" :prop="`newCoils.${index}.grossWeight`">
-          <input 
-            v-model="coil.grossWeight" 
-            type="number" 
-            placeholder="请输入毛重" 
-            class="input-control"
-          />
-        </uni-form-item>
-
-        <uni-form-item :label="`净重(kg)(${index + 1})`" :prop="`newCoils.${index}.netWeight`">
-          <input 
-            v-model="coil.netWeight" 
-            type="number" 
-            placeholder="请输入净重" 
-            class="input-control"
-          />
-        </uni-form-item>
-
-        <!-- 卷分隔线 -->
-        <view class="coil-divider" v-if="index !== form.newCoils.length - 1"></view>
-      </view>
-
-      <!-- 确认按钮 -->
-      <uni-form-item>
-        <button class="confirm-btn" @click="handleConfirm">
-          确认信息并录入系统
-        </button>
-      </uni-form-item>
-    </uni-form>
-  </view>
+	<view class="apart-container">
+		<!-- 扫码按钮 -->
+		<view class="scan-section" v-if="!form.coilId">
+			<view class="scan-btn-wrapper" @click="handleScan">
+				<view class="scan-icon">
+					<text class="icon-camera">📷</text>
+				</view>
+				<text class="scan-tip">扫描要分卷的钢卷</text>
+			</view>
+		</view>
+		
+		<!-- 原钢卷信息 -->
+		<view class="info-card" v-if="form.coilId">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">原钢卷信息</text>
+			</view>
+			
+			<view class="info-grid">
+				<view class="info-item">
+					<text class="item-label">入场钢卷号</text>
+					<text class="item-value">{{ coilDetail.enterCoilNo || '-' }}</text>
+				</view>
+				<view class="info-item">
+					<text class="item-label">当前钢卷号</text>
+					<text class="item-value">{{ coilDetail.currentCoilNo || '-' }}</text>
+				</view>
+				<view class="info-item">
+					<text class="item-label">当前库区</text>
+					<text class="item-value">{{ (coilDetail.warehouse && coilDetail.warehouse.warehouseName) || '未分配' }}</text>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 分卷列表 -->
+		<view class="form-card" v-if="form.coilId" @click="closeWarehouseList">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">分卷配置</text>
+			</view>
+			
+			<!-- 分卷数量选择 -->
+			<view class="form-item">
+				<text class="form-label">分卷数量</text>
+				<view class="split-count-selector">
+					<view 
+						class="count-btn" 
+						:class="{ 'count-btn-disabled': splitCoils.length <= 2 }"
+						@click="changeSplitCount(-1)"
+					>
+						<text>-</text>
+					</view>
+					<text class="count-value">{{ splitCoils.length }}</text>
+					<view 
+						class="count-btn"
+						:class="{ 'count-btn-disabled': splitCoils.length >= 10 }"
+						@click="changeSplitCount(1)"
+					>
+						<text>+</text>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 分卷信息列表 -->
+			<view class="split-list">
+				<view 
+					class="split-item" 
+					v-for="(item, index) in splitCoils" 
+					:key="index"
+				>
+					<view class="split-header">
+						<text class="split-title">分卷 {{ index + 1 }}</text>
+					</view>
+					<view class="split-body">
+						<view class="split-field">
+							<text class="field-label">新钢卷号</text>
+							<input 
+								v-model="item.currentCoilNo" 
+								placeholder="请输入新钢卷号" 
+								class="field-input"
+							/>
+						</view>
+						<view class="split-field">
+							<text class="field-label">班组</text>
+							<input 
+								v-model="item.team" 
+								placeholder="请输入班组名称" 
+								class="field-input"
+							/>
+						</view>
+						<view class="split-field">
+							<text class="field-label-optional">目标库区</text>
+							<view 
+								class="picker-input" 
+								@click="showWarehousePickerForItem(index)"
+							>
+								<text class="picker-text" :class="{ 'picker-placeholder': !item.warehouseName }">
+									{{ item.warehouseName || '请选择目标库区' }}
+								</text>
+								<text class="picker-arrow">▼</text>
+							</view>
+						</view>
+						<view class="split-field">
+							<text class="field-label-optional">毛重 (kg)</text>
+							<input 
+								v-model="item.grossWeight" 
+								type="digit"
+								placeholder="请输入毛重（选填）" 
+								class="field-input"
+							/>
+						</view>
+						<view class="split-field">
+							<text class="field-label-optional">净重 (kg)</text>
+							<input 
+								v-model="item.netWeight" 
+								type="digit"
+								placeholder="请输入净重（选填）" 
+								class="field-input"
+							/>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 操作者信息 -->
+			<view class="operator-info">
+				<text class="operator-label">操作人：</text>
+				<text class="operator-name">{{ operatorName }}</text>
+			</view>
+			
+			<!-- 操作按钮 -->
+			<view class="action-buttons">
+				<button class="btn btn-secondary" @click="handleReset">重新扫码</button>
+				<button class="btn btn-primary" @click="handleConfirm" :disabled="loading">
+					{{ loading ? '提交中...' : '确认分卷' }}
+				</button>
+			</view>
+		</view>
+		
+		<!-- 库区选择弹窗 -->
+		<uni-popup ref="warehousePopup" type="bottom">
+			<view class="warehouse-popup">
+				<view class="popup-header">
+					<text class="popup-title">选择库区</text>
+					<text class="popup-close" @click="closeWarehousePickerForItem">✕</text>
+				</view>
+				<view class="popup-search">
+					<input 
+						v-model="warehouseSearchKeyword" 
+						@input="filterWarehousesInPicker"
+						placeholder="搜索库区名称" 
+						class="search-input"
+					/>
+				</view>
+				<scroll-view class="popup-body" scroll-y>
+					<view 
+						class="warehouse-item" 
+						v-for="warehouse in filteredWarehousesInPicker" 
+						:key="warehouse.warehouseId"
+						@click="selectWarehouseFromPicker(warehouse)"
+					>
+						<text class="warehouse-name">{{ warehouse.warehouseName }}</text>
+						<text class="warehouse-check" v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].warehouseId === warehouse.warehouseId">✓</text>
+					</view>
+					<view class="empty-tip" v-if="!filteredWarehousesInPicker || filteredWarehousesInPicker.length === 0">
+						<text>未找到匹配的库区</text>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
 import { getGenerateRecord } from '@/api/wms/code.js'
-import { updateMaterialCoil } from '@/api/wms/coil.js'
+import { updateMaterialCoil, getMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil.js'
+import { listWarehouse } from '@/api/wms/warehouse.js'
 
 export default {
-  data() {
-    return {
-      form: {
-        coilId: undefined,
-        hasMergeSplit: 1, // 1表示分卷
-        newCoils: [
-          {
-            itemType: 'raw_material',
-            itemId: undefined,
-            team: undefined,
-            currentCoilNo: undefined,
-            warehouseId: undefined,
-            grossWeight: undefined,
-            netWeight: undefined,
-          }
-        ]
-      },
-      // 表单验证规则（适配数组形式的多卷数据）
-      rules: {
-        // 基础验证：必须扫码
-        coilId: {
-          required: true,
-          message: '请先扫码获取卷ID',
-          trigger: ['change', 'blur']
-        },
-        // 多卷验证规则（通过newCoils[index].xxx形式匹配）
-        'newCoils.*.itemType': {
-          required: true,
-          message: '请选择物料类型',
-          trigger: 'change'
-        },
-        'newCoils.*.itemId': {
-          required: true,
-          message: '请选择对应原料/产品',
-          trigger: 'change'
-        },
-        'newCoils.*.team': {
-          required: true,
-          message: '请输入所属班组',
-          trigger: 'blur'
-        },
-        'newCoils.*.currentCoilNo': {
-          required: true,
-          message: '请输入当前卷号',
-          trigger: 'blur'
-        },
-        'newCoils.*.grossWeight': {
-          required: true,
-          message: '请输入毛重',
-          trigger: 'blur',
-          type: 'number'
-        },
-        'newCoils.*.netWeight': {
-          required: true,
-          message: '请输入净重',
-          trigger: 'blur',
-          type: 'number'
-        }
-      }
-    }
-  },
-  methods: {
-    // 处理扫码逻辑
-    handleScan() {
-      uni.scanCode({
-        success: (res) => {
-          console.log('扫码结果：', res.result)
-          getGenerateRecord(res.result).then(res => {
-            const result = JSON.parse(res.data.content);
-            this.$set(this.form, 'coilId', result.coil_id);
-            this.$refs.form?.validateField('coilId'); // 验证扫码字段
-            console.log('扫码获取的卷信息：', result);
-          }).catch(err => {
-            uni.showToast({
-              title: '扫码信息解析失败',
-              icon: 'none'
-            })
-          })
-        },
-        fail: (err) => {
-          console.error('扫码失败：', err)
-          uni.showToast({
-            title: '扫码失败，请重试',
-            icon: 'none'
-          })
-        }
-      })
-    },
-
-    // 添加新卷
-    addCoil() {
-      // 初始化新卷数据（与初始卷结构一致）
-      const newCoil = {
-        itemType: 'raw_material',
-        itemId: undefined,
-        team: undefined,
-        currentCoilNo: undefined,
-        warehouseId: undefined,
-        grossWeight: undefined,
-        netWeight: undefined,
-      };
-      this.form.newCoils.push(newCoil);
-      // 清除表单验证状态（避免新增项显示错误）
-      this.$refs.form?.clearValidate();
-    },
-
-    // 删除指定卷
-    deleteCoil(index) {
-      uni.showModal({
-        title: '确认删除',
-        content: `确定要删除第${index + 1}卷吗？`,
-        success: (res) => {
-          if (res.confirm) {
-            this.form.newCoils.splice(index, 1);
-            // 清除表单验证状态
-            this.$refs.form?.clearValidate();
-          }
-        }
-      })
-    },
-
-    // 处理确认提交
-    handleConfirm() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          // 提交的数据包含：原始卷ID + 分卷标识 + 所有新卷信息
-          updateMaterialCoil(this.form).then(res => {
-            uni.showToast({
-              title: '分卷信息录入成功',
-              icon: 'success'
-            })
-            // 重置表单
-            this.resetForm();
-          }).catch(err => {
-            console.error('提交失败：', err)
-            uni.showToast({
-              title: '录入失败，请重试',
-              icon: 'none'
-            })
-          })
-        } else {
-          // 验证失败时滚动到第一个错误项
-          this.scrollToErrorField();
-          return false;
-        }
-      })
-    },
-
-    // 重置表单
-    resetForm() {
-      this.form = {
-        coilId: undefined,
-        hasMergeSplit: 1,
-        newCoils: [
-          {
-            itemType: 'raw_material',
-            itemId: undefined,
-            team: undefined,
-            currentCoilNo: undefined,
-            warehouseId: undefined,
-            grossWeight: undefined,
-            netWeight: undefined,
-          }
-        ]
-      };
-      this.$refs.form?.resetFields();
-    },
-
-    // 滚动到第一个错误的表单项
-    scrollToErrorField() {
-      const errorEl = document.querySelector('.uni-form-item--error');
-      if (errorEl) {
-        errorEl.scrollIntoView({ behavior: 'smooth', block: 'center' });
-      }
-    }
-  }
+	data() {
+		return {
+			form: {
+				coilId: undefined,
+				hasMergeSplit: 1 // 1表示分卷
+			},
+			coilDetail: {},
+			splitCoils: [
+				{ 
+					currentCoilNo: '', 
+					team: '',
+					hasMergeSplit: 1,
+					warehouseId: undefined,
+					warehouseName: '',
+					warehouseKeyword: '',
+					filteredWarehouses: [],
+					showWarehouseList: false,
+					grossWeight: '',
+					netWeight: ''
+				},
+				{ 
+					currentCoilNo: '', 
+					team: '',
+					hasMergeSplit: 1,
+					warehouseId: undefined,
+					warehouseName: '',
+					warehouseKeyword: '',
+					filteredWarehouses: [],
+					showWarehouseList: false,
+					grossWeight: '',
+					netWeight: ''
+				}
+			],
+			warehouses: [],
+			warehouseSearchKeyword: '',
+			filteredWarehousesInPicker: [],
+			currentPickerItemIndex: -1,
+			loading: false
+		}
+	},
+	
+	computed: {
+		operatorName() {
+			return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+		}
+	},
+	
+	onLoad() {
+		this.loadWarehouses();
+	},
+	
+	mounted() {
+		this.loadWarehouses();
+	},
+	
+	methods: {
+		// 加载库区列表
+		async loadWarehouses() {
+			console.log('开始加载库区...');
+			try {
+				const res = await listWarehouse({ pageNum: 1, pageSize: 1000 });
+				console.log("库区返回值", res);
+				if (res.code === 200) {
+					this.warehouses = res.data || [];
+					console.log('库区加载成功，数量:', this.warehouses.length);
+					// 为每个分卷初始化库区列表
+					this.splitCoils.forEach(item => {
+						item.filteredWarehouses = [...this.warehouses];
+					});
+					console.log('分卷库区列表初始化完成');
+				} else {
+					console.error('库区加载失败:', res.msg);
+				}
+			} catch (err) {
+				console.error('加载库区异常:', err);
+			}
+		},
+		
+		// 过滤库区（为特定分卷）
+		filterWarehousesForItem(index) {
+			console.log(`分卷页面过滤库区，分卷${index + 1}，关键词:`, this.splitCoils[index].warehouseKeyword);
+			console.log('分卷页面当前库区列表:', this.warehouses);
+			const item = this.splitCoils[index];
+			const keyword = item.warehouseKeyword.trim().toLowerCase();
+			if (!keyword) {
+				item.filteredWarehouses = [...this.warehouses];
+			} else {
+				item.filteredWarehouses = this.warehouses.filter(warehouse => {
+					const name = (warehouse.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+			console.log(`分卷页面过滤后库区数量:`, item.filteredWarehouses.length);
+			item.showWarehouseList = true;
+		},
+		
+		// 选择库区（为特定分卷）
+		selectWarehouseForItem(index, warehouse) {
+			const item = this.splitCoils[index];
+			item.warehouseId = warehouse.warehouseId;
+			item.warehouseName = warehouse.warehouseName;
+			item.warehouseKeyword = warehouse.warehouseName;
+			item.showWarehouseList = false;
+		},
+		
+		// 关闭所有库区搜索列表
+		closeWarehouseList() {
+			this.splitCoils.forEach(item => {
+				item.showWarehouseList = false;
+			});
+		},
+		
+		// 显示库区选择器（为特定分卷）
+		showWarehousePickerForItem(index) {
+			this.currentPickerItemIndex = index;
+			this.warehouseSearchKeyword = '';
+			this.filteredWarehousesInPicker = [...this.warehouses];
+			this.$refs.warehousePopup.open();
+		},
+		
+		// 关闭库区选择器
+		closeWarehousePickerForItem() {
+			this.currentPickerItemIndex = -1;
+			this.$refs.warehousePopup.close();
+		},
+		
+		// 在选择器中过滤库区
+		filterWarehousesInPicker() {
+			const keyword = this.warehouseSearchKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredWarehousesInPicker = [...this.warehouses];
+			} else {
+				this.filteredWarehousesInPicker = this.warehouses.filter(warehouse => {
+					const name = (warehouse.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+		},
+		
+		// 从选择器中选择库区
+		selectWarehouseFromPicker(warehouse) {
+			if (this.currentPickerItemIndex !== -1) {
+				const item = this.splitCoils[this.currentPickerItemIndex];
+				item.warehouseId = warehouse.warehouseId;
+				item.warehouseName = warehouse.warehouseName;
+				item.warehouseKeyword = warehouse.warehouseName;
+			}
+			this.closeWarehousePickerForItem();
+		},
+		
+		// 扫码
+		handleScan() {
+			uni.scanCode({
+				success: async (res) => {
+					console.log('扫码结果：', res.result);
+					try {
+						const qrcodeId = res.result;
+						
+						// 1. 获取二维码详情
+						const qrcodeRes = await getGenerateRecord(qrcodeId);
+						if (qrcodeRes.code !== 200) {
+							throw new Error('未找到二维码记录');
+						}
+						
+						// 2. 解析content获取enter_coil_no和current_coil_no
+						const qrcodeRecord = qrcodeRes.data;
+						const content = JSON.parse(qrcodeRecord.content);
+						const enterCoilNo = content.enter_coil_no;
+						const currentCoilNo = content.current_coil_no;
+						
+						if (!enterCoilNo) {
+							throw new Error('二维码中未包含有效的入场钢卷号');
+						}
+						
+						// 3. 通过追溯接口获取准确的钢卷信息
+						const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
+						if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records.length === 0) {
+							throw new Error('未找到钢卷信息');
+						}
+						
+						// 4. 找到当前数据
+						let coilData = null;
+						for (const record of traceRes.data.records) {
+							if (record.dataType === 1 && record.currentCoilNo === currentCoilNo) {
+								coilData = record;
+								break;
+							}
+						}
+						
+						if (!coilData) {
+							for (const record of traceRes.data.records) {
+								if (record.dataType === 1) {
+									coilData = record;
+									break;
+								}
+							}
+						}
+						
+						if (!coilData) {
+							coilData = traceRes.data.records[0];
+						}
+						this.coilDetail = coilData;
+						this.form.coilId = coilData.coilId;
+						
+						console.log('钢卷详情：', coilData);
+						uni.showToast({
+							title: '扫码成功',
+							icon: 'success'
+						});
+					} catch (err) {
+						console.error('扫码处理失败：', err);
+						uni.showToast({
+							title: err.message || '扫码信息解析失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				},
+				fail: (err) => {
+					console.error('扫码失败：', err);
+					uni.showToast({
+						title: '扫码失败，请重试',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		
+		// 修改分卷数量
+		changeSplitCount(delta) {
+			const newCount = this.splitCoils.length + delta;
+			if (newCount < 2 || newCount > 10) {
+				return;
+			}
+			
+			if (delta > 0) {
+				// 增加分卷
+				this.splitCoils.push({
+					currentCoilNo: '',
+					team: '',
+					hasMergeSplit: 1,
+					warehouseId: undefined,
+					warehouseName: '',
+					warehouseKeyword: '',
+					filteredWarehouses: this.warehouses,
+					showWarehouseList: false,
+					grossWeight: '',
+					netWeight: ''
+				});
+			} else {
+				// 减少分卷
+				this.splitCoils.pop();
+			}
+		},
+		
+		// 重新扫码
+		handleReset() {
+			uni.showModal({
+				title: '确认重新扫码',
+				content: '是否要清空当前数据并重新扫码？',
+				success: (res) => {
+					if (res.confirm) {
+						this.form = {
+							coilId: undefined,
+							hasMergeSplit: 1
+						};
+						this.coilDetail = {};
+						this.splitCoils = [
+							{ 
+								currentCoilNo: '', 
+								team: '',
+								hasMergeSplit: 1,
+								warehouseId: undefined,
+								warehouseName: '',
+								warehouseKeyword: '',
+								filteredWarehouses: this.warehouses,
+								showWarehouseList: false,
+								grossWeight: '',
+								netWeight: ''
+							},
+							{ 
+								currentCoilNo: '', 
+								team: '',
+								hasMergeSplit: 1,
+								warehouseId: undefined,
+								warehouseName: '',
+								warehouseKeyword: '',
+								filteredWarehouses: this.warehouses,
+								showWarehouseList: false,
+								grossWeight: '',
+								netWeight: ''
+							}
+						];
+					}
+				}
+			});
+		},
+		
+		// 提交分卷
+		handleConfirm() {
+			// 验证所有分卷都有钢卷号和班组
+			for (let i = 0; i < this.splitCoils.length; i++) {
+				if (!this.splitCoils[i].currentCoilNo) {
+					uni.showToast({ 
+						title: `请输入分卷 ${i + 1} 的钢卷号`, 
+						icon: 'none' 
+					});
+					return;
+				}
+				if (!this.splitCoils[i].team) {
+					uni.showToast({ 
+						title: `请输入分卷 ${i + 1} 的班组`, 
+						icon: 'none' 
+					});
+					return;
+				}
+			}
+			
+			this.loading = true;
+			
+			// 构建提交数据
+			const submitData = {
+				coilId: this.form.coilId,
+				enterCoilNo: this.coilDetail.enterCoilNo, // 添加入场钢卷号
+				supplierCoilNo: this.coilDetail.supplierCoilNo, // 保留厂家原料卷号
+				currentCoilNo: this.coilDetail.currentCoilNo, // 添加当前钢卷号
+				hasMergeSplit: 1, // 分卷标识
+				newCoils: this.splitCoils.map(item => ({
+					currentCoilNo: item.currentCoilNo,
+					team: item.team,
+					hasMergeSplit: 1,
+					itemType: this.coilDetail.itemType,
+					itemId: this.coilDetail.itemId,
+					warehouseId: item.warehouseId || this.coilDetail.warehouseId, // 使用分卷的库区或原库区
+					grossWeight: item.grossWeight ? Number(item.grossWeight) : null,
+					netWeight: item.netWeight ? Number(item.netWeight) : null
+				}))
+			};
+			
+			updateMaterialCoil(submitData).then(res => {
+				if (res.code === 200) {
+					uni.showToast({
+						title: '分卷成功',
+						icon: 'success'
+					});
+					setTimeout(() => {
+						this.handleReset();
+					}, 1500);
+				} else {
+					uni.showToast({
+						title: res.msg || '分卷失败',
+						icon: 'none'
+					});
+				}
+			}).catch(err => {
+				console.error('提交失败：', err);
+				uni.showToast({
+					title: '分卷失败，请重试',
+					icon: 'none'
+				});
+			}).finally(() => {
+				this.loading = false;
+			});
+		}
+	}
 }
 </script>
 
-<style>
-.container {
-  padding: 30rpx 20rpx;
+<style scoped lang="scss">
+.apart-container {
+	padding-bottom: 30rpx;
 }
 
-/* 扫码按钮样式 */
-.scan-btn {
-  width: 600rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  font-size: 36rpx;
-  background-color: #007aff;
-  color: white;
-  border-radius: 50rpx;
-  margin: 0 auto 60rpx;
-  display: block;
-  box-shadow: 0 4rpx 10rpx rgba(0, 122, 255, 0.3);
+/* 扫码区域 */
+.scan-section {
+	padding: 80rpx 40rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	
+	.scan-btn-wrapper {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 30rpx;
+		
+		.scan-icon {
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 50%;
+			background: linear-gradient(135deg, #ff9500 0%, #ff6b00 100%);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-shadow: 0 8rpx 24rpx rgba(255, 149, 0, 0.3);
+			
+			&:active {
+				transform: scale(0.95);
+			}
+		}
+		
+		.icon-camera {
+			font-size: 70rpx;
+		}
+		
+		.scan-tip {
+			font-size: 28rpx;
+			color: #666;
+		}
+	}
 }
 
-/* 分卷控制区 */
-.coil-control {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin: 0 0 40rpx 20rpx;
+/* 卡片样式 */
+.info-card,
+.form-card {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
 }
 
-.control-text {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 500;
+.card-title {
+	display: flex;
+	align-items: center;
+	margin-bottom: 25rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+	
+	.title-dot {
+		width: 8rpx;
+		height: 28rpx;
+		background: #ff9500;
+		border-radius: 4rpx;
+		margin-right: 12rpx;
+	}
+	
+	.title-text {
+		flex: 1;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
 }
 
-.add-btn {
-  width: 180rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  font-size: 28rpx;
-  background-color: #4cd964;
-  color: white;
-  border-radius: 8rpx;
+/* 信息网格 */
+.info-grid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20rpx;
+	
+	.info-item {
+		flex: 1;
+		min-width: 45%;
+		background: #f8f9fa;
+		padding: 20rpx;
+		border-radius: 12rpx;
+		
+		.item-label {
+			display: block;
+			font-size: 24rpx;
+			color: #999;
+			margin-bottom: 10rpx;
+		}
+		
+		.item-value {
+			display: block;
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 500;
+		}
+	}
 }
 
-/* 单卷表单组样式 */
-.coil-group {
-  padding: 20rpx;
-  margin-bottom: 20rpx;
-  background-color: #f9f9f9;
-  border-radius: 10rpx;
+/* 表单项 */
+.form-item {
+	margin-bottom: 30rpx;
+	
+	.form-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 15rpx;
+		font-weight: 500;
+		
+		&::before {
+			content: '*';
+			color: #ff4d4f;
+			margin-right: 6rpx;
+		}
+	}
 }
 
-/* 卷标题 */
-.coil-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20rpx;
-  padding-bottom: 10rpx;
-  border-bottom: 1px solid #eee;
+/* 分卷数量选择器 */
+.split-count-selector {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 40rpx;
+	padding: 20rpx 0;
+	
+	.count-btn {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		background: linear-gradient(135deg, #ff9500 0%, #ff6b00 100%);
+		color: #fff;
+		font-size: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 4rpx 12rpx rgba(255, 149, 0, 0.2);
+		
+		&:active {
+			transform: scale(0.95);
+		}
+		
+		&.count-btn-disabled {
+			background: #e8e8e8;
+			color: #999;
+			box-shadow: none;
+		}
+	}
+	
+	.count-value {
+		font-size: 48rpx;
+		font-weight: 600;
+		color: #333;
+		min-width: 80rpx;
+		text-align: center;
+	}
 }
 
-.coil-title text {
-  font-size: 34rpx;
-  color: #007aff;
-  font-weight: bold;
+/* 分卷列表 */
+.split-list {
+	margin-top: 20rpx;
+	
+	.split-item {
+		background: #f8f9fa;
+		border-radius: 12rpx;
+		padding: 24rpx;
+		margin-bottom: 20rpx;
+		
+		&:last-child {
+			margin-bottom: 0;
+		}
+		
+		.split-header {
+			margin-bottom: 20rpx;
+			
+			.split-title {
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #ff9500;
+			}
+		}
+		
+		.split-body {
+			.split-field {
+				margin-bottom: 20rpx;
+				
+				&:last-child {
+					margin-bottom: 0;
+				}
+				
+				.field-label {
+					display: block;
+					font-size: 26rpx;
+					color: #666;
+					margin-bottom: 12rpx;
+				}
+				
+				.field-label-optional {
+					display: block;
+					font-size: 26rpx;
+					color: #666;
+					margin-bottom: 12rpx;
+				}
+				
+				.field-input {
+					width: 100%;
+					height: 80rpx;
+					padding: 0 20rpx;
+					background: #fff;
+					border: 2rpx solid #e8e8e8;
+					border-radius: 10rpx;
+					font-size: 28rpx;
+					color: #333;
+					box-sizing: border-box;
+					
+					&:focus {
+						border-color: #ff9500;
+					}
+				}
+				
+				.picker-input {
+					width: 100%;
+					height: 80rpx;
+					padding: 0 20rpx;
+					background: #fff;
+					border: 2rpx solid #e8e8e8;
+					border-radius: 10rpx;
+					box-sizing: border-box;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					transition: all 0.3s;
+					
+					&:active {
+						background: #f0f7ff;
+						border-color: #ff9500;
+					}
+					
+					.picker-text {
+						flex: 1;
+						font-size: 28rpx;
+						color: #333;
+						
+						&.picker-placeholder {
+							color: #999;
+						}
+					}
+					
+					.picker-arrow {
+						font-size: 24rpx;
+						color: #999;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
 }
 
-/* 删除按钮 */
-.delete-btn {
-  width: 120rpx;
-  height: 50rpx;
-  line-height: 50rpx;
-  font-size: 26rpx;
-  background-color: #ff3b30;
-  color: white;
-  border-radius: 8rpx;
+/* 操作者信息 */
+.operator-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx 0;
+	margin-top: 20rpx;
+	
+	.operator-label {
+		font-size: 26rpx;
+		color: #999;
+	}
+	
+	.operator-name {
+		font-size: 26rpx;
+		color: #ff9500;
+		font-weight: 500;
+	}
 }
 
-/* 输入框样式 */
-.input-control {
-  width: 100%;
-  height: 80rpx;
-  line-height: 80rpx;
-  border: 1px solid #eee;
-  border-radius: 8rpx;
-  padding: 0 20rpx;
-  box-sizing: border-box;
-  font-size: 32rpx;
+/* 操作按钮 */
+.action-buttons {
+	display: flex;
+	gap: 20rpx;
+	margin-top: 30rpx;
+	
+	.btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 12rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		border: none;
+		transition: all 0.2s;
+		
+		&:active {
+			transform: scale(0.98);
+		}
+		
+		&[disabled] {
+			opacity: 0.6;
+		}
+	}
+	
+	.btn-secondary {
+		background: #f5f5f5;
+		color: #666;
+	}
+	
+	.btn-primary {
+		background: linear-gradient(135deg, #ff9500 0%, #ff6b00 100%);
+		color: #fff;
+		box-shadow: 0 4rpx 16rpx rgba(255, 149, 0, 0.3);
+	}
 }
 
-/* 确认按钮样式 */
-.confirm-btn {
-  width: 100%;
-  height: 90rpx;
-  line-height: 90rpx;
-  font-size: 32rpx;
-  background-color: #00b42a;
-  color: white;
-  border-radius: 10rpx;
-  margin-top: 30rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 180, 42, 0.2);
+/* 库区选择弹窗 */
+.warehouse-popup {
+	background: #fff;
+	border-radius: 24rpx 24rpx 0 0;
+	max-height: 70vh;
+	
+	.popup-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.popup-title {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+		}
+		
+		.popup-close {
+			font-size: 40rpx;
+			color: #999;
+			width: 60rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	
+	.popup-search {
+		padding: 20rpx 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.search-input {
+			width: 100%;
+			height: 80rpx;
+			padding: 0 20rpx;
+			background: #f8f9fa;
+			border: 2rpx solid #e8e8e8;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			
+			&:focus {
+				background: #fff;
+				border-color: #ff9500;
+			}
+		}
+	}
+	
+	.popup-body {
+		max-height: 400rpx;
+		
+		.warehouse-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 30rpx;
+			border-bottom: 1rpx solid #f5f5f5;
+			
+			&:last-child {
+				border-bottom: none;
+			}
+			
+			&:active {
+				background: #fff3e0;
+			}
+			
+			.warehouse-name {
+				flex: 1;
+				font-size: 28rpx;
+				color: #333;
+			}
+			
+			.warehouse-check {
+				font-size: 32rpx;
+				color: #ff9500;
+				font-weight: bold;
+			}
+		}
+		
+		.empty-tip {
+			text-align: center;
+			padding: 60rpx 0;
+			color: #999;
+			font-size: 28rpx;
+		}
+	}
 }
-
-/* 表单项间距 */
-.uni-form-item {
-  margin-bottom: 25rpx !important;
-}
-
-/* 卷分隔线 */
-.coil-divider {
-  height: 1px;
-  background-color: #eee;
-  margin: 30rpx 0;
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/apps/hand-factory/components/panels/code/merge.vue b/apps/hand-factory/components/panels/code/merge.vue
index 41f5105..7c6ba18 100644
--- a/apps/hand-factory/components/panels/code/merge.vue
+++ b/apps/hand-factory/components/panels/code/merge.vue
@@ -1,12 +1,887 @@
 <template>
-	<view class="">
-			合并
+	<view class="merge-container">
+		<!-- 扫码提示 -->
+		<view class="scan-section">
+			<view class="scan-btn-wrapper" @click="handleScan">
+				<view class="scan-icon">
+					<text class="icon-camera">📷</text>
+				</view>
+				<text class="scan-tip">扫描要合卷的钢卷</text>
+				<text class="scan-hint">已扫描 {{ scannedCoils.length }} 个钢卷</text>
+			</view>
+		</view>
+		
+		<!-- 已扫描的钢卷列表 -->
+		<view class="coil-list" v-if="scannedCoils.length > 0">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">待合卷列表</text>
+			</view>
+			
+			<view class="coil-item" v-for="(coil, index) in scannedCoils" :key="index">
+				<view class="coil-content">
+					<view class="coil-index">{{ index + 1 }}</view>
+					<view class="coil-info">
+						<view class="coil-row">
+							<text class="coil-label">入场钢卷号：</text>
+							<text class="coil-value">{{ coil.enterCoilNo }}</text>
+						</view>
+						<view class="coil-row">
+							<text class="coil-label">当前钢卷号：</text>
+							<text class="coil-value">{{ coil.currentCoilNo }}</text>
+						</view>
+						<view class="coil-row" v-if="coil.warehouse">
+							<text class="coil-label">库区：</text>
+							<text class="coil-value">{{ coil.warehouse.warehouseName }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="coil-remove" @click="removeCoil(index)">
+					<text>✕</text>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 合卷配置 -->
+		<view class="form-card" v-if="scannedCoils.length >= 2" @click="closeWarehouseList">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">合卷配置</text>
+			</view>
+			
+			<!-- 新钢卷号 -->
+			<view class="form-item">
+				<text class="form-label">新钢卷号</text>
+				<input 
+					v-model="mergedCoilNo" 
+					placeholder="请输入合卷后的新钢卷号" 
+					class="form-input"
+				/>
+			</view>
+			
+			<!-- 班组 -->
+			<view class="form-item">
+				<text class="form-label">班组</text>
+				<input 
+					v-model="team" 
+					placeholder="请输入班组名称" 
+					class="form-input"
+				/>
+			</view>
+			
+			<!-- 目标库区 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">目标库区</text>
+				<view 
+					class="picker-input" 
+					@click="showWarehousePicker()"
+				>
+					<text class="picker-text" :class="{ 'picker-placeholder': !warehouseName }">
+						{{ warehouseName || '请选择目标库区' }}
+					</text>
+					<text class="picker-arrow">▼</text>
+				</view>
+			</view>
+			
+			<!-- 毛重 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">毛重 (kg)</text>
+				<input 
+					v-model="grossWeight" 
+					type="digit"
+					placeholder="请输入毛重（选填）" 
+					class="form-input"
+				/>
+			</view>
+			
+			<!-- 净重 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">净重 (kg)</text>
+				<input 
+					v-model="netWeight" 
+					type="digit"
+					placeholder="请输入净重（选填）" 
+					class="form-input"
+				/>
+			</view>
+			
+			<!-- 操作者信息 -->
+			<view class="operator-info">
+				<text class="operator-label">操作人：</text>
+				<text class="operator-name">{{ operatorName }}</text>
+			</view>
+			
+			<!-- 操作按钮 -->
+			<view class="action-buttons">
+				<button class="btn btn-secondary" @click="handleReset">清空重新扫</button>
+				<button class="btn btn-primary" @click="handleConfirm" :disabled="loading">
+					{{ loading ? '提交中...' : '确认合卷' }}
+				</button>
+			</view>
+		</view>
+		
+		<!-- 提示信息 -->
+		<view class="tip-card" v-if="scannedCoils.length === 1">
+			<text class="tip-text">至少需要扫描 2 个钢卷才能进行合卷操作</text>
+		</view>
+		
+		<!-- 库区选择弹窗 -->
+		<uni-popup ref="warehousePopup" type="bottom">
+			<view class="warehouse-popup">
+				<view class="popup-header">
+					<text class="popup-title">选择库区</text>
+					<text class="popup-close" @click="closeWarehousePicker">✕</text>
+				</view>
+				<view class="popup-search">
+					<input 
+						v-model="warehouseSearchKeyword" 
+						@input="filterWarehousesInPicker"
+						placeholder="搜索库区名称" 
+						class="search-input"
+					/>
+				</view>
+				<scroll-view class="popup-body" scroll-y>
+					<view 
+						class="warehouse-item" 
+						v-for="warehouse in filteredWarehousesInPicker" 
+						:key="warehouse.warehouseId"
+						@click="selectWarehouseFromPicker(warehouse)"
+					>
+						<text class="warehouse-name">{{ warehouse.warehouseName }}</text>
+						<text class="warehouse-check" v-if="warehouseId === warehouse.warehouseId">✓</text>
+					</view>
+					<view class="empty-tip" v-if="!filteredWarehousesInPicker || filteredWarehousesInPicker.length === 0">
+						<text>未找到匹配的库区</text>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+import { getGenerateRecord } from '@/api/wms/code.js'
+import { updateMaterialCoil, getMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil.js'
+import { listWarehouse } from '@/api/wms/warehouse.js'
+
+export default {
+	data() {
+		return {
+			scannedCoils: [],
+			mergedCoilNo: '',
+			team: '',
+			warehouseId: undefined,
+			warehouseName: '',
+			warehouseKeyword: '',
+			warehouses: [],
+			filteredWarehouses: [],
+			showWarehouseList: false,
+			warehouseSearchKeyword: '',
+			filteredWarehousesInPicker: [],
+			grossWeight: '',
+			netWeight: '',
+			loading: false
+		}
+	},
 	
+	onLoad() {
+		this.loadWarehouses();
+	},
+	
+	mounted() {
+		this.loadWarehouses();
+	},
+	
+	computed: {
+		operatorName() {
+			return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+		}
+	},
+	
+	methods: {
+		// 加载库区列表
+		async loadWarehouses() {
+			console.log('合卷页面开始加载库区...');
+			try {
+				const res = await listWarehouse({ pageNum: 1, pageSize: 1000 });
+				console.log("合卷页面库区返回值", res);
+				if (res.code === 200) {
+					this.warehouses = res.data || [];
+					this.filteredWarehouses = [...this.warehouses];
+					console.log('合卷页面库区加载成功，数量:', this.warehouses.length);
+				} else {
+					console.error('合卷页面库区加载失败:', res.msg);
+				}
+			} catch (err) {
+				console.error('合卷页面加载库区异常:', err);
+			}
+		},
+		
+		// 过滤库区
+		filterWarehouses() {
+			console.log('合卷页面过滤库区，关键词:', this.warehouseKeyword);
+			console.log('合卷页面当前库区列表:', this.warehouses);
+			const keyword = this.warehouseKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredWarehouses = this.warehouses;
+			} else {
+				this.filteredWarehouses = this.warehouses.filter(warehouse => {
+					const name = (warehouse.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+			console.log('合卷页面过滤后库区数量:', this.filteredWarehouses.length);
+			this.showWarehouseList = true;
+		},
+		
+		// 选择库区
+		selectWarehouse(warehouse) {
+			this.warehouseId = warehouse.warehouseId;
+			this.warehouseName = warehouse.warehouseName;
+			this.warehouseKeyword = warehouse.warehouseName;
+			this.showWarehouseList = false;
+		},
+		
+		// 关闭库区搜索列表
+		closeWarehouseList() {
+			this.showWarehouseList = false;
+		},
+		
+		// 显示库区选择器
+		showWarehousePicker() {
+			this.warehouseSearchKeyword = '';
+			this.filteredWarehousesInPicker = [...this.warehouses];
+			this.$refs.warehousePopup.open();
+		},
+		
+		// 关闭库区选择器
+		closeWarehousePicker() {
+			this.$refs.warehousePopup.close();
+		},
+		
+		// 在选择器中过滤库区
+		filterWarehousesInPicker() {
+			const keyword = this.warehouseSearchKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredWarehousesInPicker = [...this.warehouses];
+			} else {
+				this.filteredWarehousesInPicker = this.warehouses.filter(warehouse => {
+					const name = (warehouse.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+		},
+		
+		// 从选择器中选择库区
+		selectWarehouseFromPicker(warehouse) {
+			this.warehouseId = warehouse.warehouseId;
+			this.warehouseName = warehouse.warehouseName;
+			this.warehouseKeyword = warehouse.warehouseName;
+			this.closeWarehousePicker();
+		},
+		
+		// 扫码
+		handleScan() {
+			uni.scanCode({
+				success: async (res) => {
+					console.log('扫码结果：', res.result);
+					try {
+						const qrcodeId = res.result;
+						
+						// 1. 获取二维码详情
+						const qrcodeRes = await getGenerateRecord(qrcodeId);
+						if (qrcodeRes.code !== 200) {
+							throw new Error('未找到二维码记录');
+						}
+						
+						// 2. 解析content获取enter_coil_no和current_coil_no
+						const qrcodeRecord = qrcodeRes.data;
+						const content = JSON.parse(qrcodeRecord.content);
+						const enterCoilNo = content.enter_coil_no;
+						const currentCoilNo = content.current_coil_no;
+						
+						if (!enterCoilNo) {
+							throw new Error('二维码中未包含有效的入场钢卷号');
+						}
+						
+						// 3. 通过追溯接口获取准确的钢卷信息
+						const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
+						if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records.length === 0) {
+							throw new Error('未找到钢卷信息');
+						}
+						
+						// 4. 找到当前数据
+						let coilData = null;
+						for (const record of traceRes.data.records) {
+							if (record.dataType === 1 && record.currentCoilNo === currentCoilNo) {
+								coilData = record;
+								break;
+							}
+						}
+						
+						if (!coilData) {
+							for (const record of traceRes.data.records) {
+								if (record.dataType === 1) {
+									coilData = record;
+									break;
+								}
+							}
+						}
+						
+						if (!coilData) {
+							coilData = traceRes.data.records[0];
+						}
+						
+						// 5. 检查是否已扫描过
+						const exists = this.scannedCoils.some(coil => coil.coilId === coilData.coilId);
+						if (exists) {
+							uni.showToast({
+								title: '该钢卷已扫描',
+								icon: 'none'
+							});
+							return;
+						}
+						this.scannedCoils.push(coilData);
+						
+						console.log('钢卷详情：', coilData);
+						uni.showToast({
+							title: `第 ${this.scannedCoils.length} 个钢卷扫描成功`,
+							icon: 'success'
+						});
+					} catch (err) {
+						console.error('扫码处理失败：', err);
+						uni.showToast({
+							title: err.message || '扫码信息解析失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				},
+				fail: (err) => {
+					console.error('扫码失败：', err);
+					uni.showToast({
+						title: '扫码失败，请重试',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		
+		// 移除钢卷
+		removeCoil(index) {
+			uni.showModal({
+				title: '确认移除',
+				content: '是否要移除此钢卷？',
+				success: (res) => {
+					if (res.confirm) {
+						this.scannedCoils.splice(index, 1);
+					}
+				}
+			});
+		},
+		
+		// 重置
+		handleReset() {
+			uni.showModal({
+				title: '确认重置',
+				content: '是否要清空所有已扫描的钢卷？',
+				success: (res) => {
+					if (res.confirm) {
+						this.scannedCoils = [];
+						this.mergedCoilNo = '';
+						this.team = '';
+						this.warehouseId = undefined;
+						this.warehouseName = '';
+						this.warehouseKeyword = '';
+						this.grossWeight = '';
+						this.netWeight = '';
+						this.showWarehouseList = false;
+					}
+				}
+			});
+		},
+		
+		// 提交合卷
+		handleConfirm() {
+			// 验证
+			if (this.scannedCoils.length < 2) {
+				uni.showToast({ 
+					title: '至少需要2个钢卷', 
+					icon: 'none' 
+				});
+				return;
+			}
+			
+			if (!this.mergedCoilNo) {
+				uni.showToast({ 
+					title: '请输入新钢卷号', 
+					icon: 'none' 
+				});
+				return;
+			}
+			
+			if (!this.team) {
+				uni.showToast({ 
+					title: '请输入班组名称', 
+					icon: 'none' 
+				});
+				return;
+			}
+			
+			this.loading = true;
+			
+			// 构建提交数据
+			// 根据后端逻辑：bo是合卷后的新钢卷，bo.newCoils是参与合卷的原始钢卷
+			const submitData = {
+				coilId: null, // 合卷时coilId为null
+				enterCoilNo: this.scannedCoils[0].enterCoilNo, // 使用第一个钢卷的入场号
+				supplierCoilNo: this.scannedCoils[0].supplierCoilNo, // 保留厂家原料卷号
+				currentCoilNo: this.mergedCoilNo,
+				team: this.team,
+				hasMergeSplit: 2, // 2表示合卷
+				itemType: this.scannedCoils[0].itemType,
+				itemId: this.scannedCoils[0].itemId,
+				warehouseId: this.warehouseId || this.scannedCoils[0].warehouseId, // 使用选择的库区或第一个钢卷的库区
+				grossWeight: this.grossWeight ? Number(this.grossWeight) : null,
+				netWeight: this.netWeight ? Number(this.netWeight) : null,
+				newCoils: this.scannedCoils.map(coil => ({
+					coilId: coil.coilId,
+					currentCoilNo: coil.currentCoilNo
+				}))
+			};
+			
+			updateMaterialCoil(submitData).then(res => {
+				if (res.code === 200) {
+					uni.showToast({
+						title: '合卷成功',
+						icon: 'success'
+					});
+					setTimeout(() => {
+						this.handleReset();
+					}, 1500);
+				} else {
+					uni.showToast({
+						title: res.msg || '合卷失败',
+						icon: 'none'
+					});
+				}
+			}).catch(err => {
+				console.error('提交失败：', err);
+				uni.showToast({
+					title: '合卷失败，请重试',
+					icon: 'none'
+				});
+			}).finally(() => {
+				this.loading = false;
+			});
+		}
+	}
+}
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style scoped lang="scss">
+.merge-container {
+	padding-bottom: 30rpx;
+}
+
+/* 扫码区域 */
+.scan-section {
+	padding: 60rpx 40rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	
+	.scan-btn-wrapper {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 20rpx;
+		
+		.scan-icon {
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 50%;
+			background: linear-gradient(135deg, #34c759 0%, #30b350 100%);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-shadow: 0 8rpx 24rpx rgba(52, 199, 89, 0.3);
+			
+			&:active {
+				transform: scale(0.95);
+			}
+		}
+		
+		.icon-camera {
+			font-size: 70rpx;
+		}
+		
+		.scan-tip {
+			font-size: 28rpx;
+			color: #666;
+		}
+		
+		.scan-hint {
+			font-size: 24rpx;
+			color: #34c759;
+			font-weight: 500;
+		}
+	}
+}
+
+/* 钢卷列表 */
+.coil-list {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+
+.card-title {
+	display: flex;
+	align-items: center;
+	margin-bottom: 25rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+	
+	.title-dot {
+		width: 8rpx;
+		height: 28rpx;
+		background: #34c759;
+		border-radius: 4rpx;
+		margin-right: 12rpx;
+	}
+	
+	.title-text {
+		flex: 1;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+}
+
+.coil-item {
+	display: flex;
+	align-items: center;
+	background: #f8f9fa;
+	border-radius: 12rpx;
+	padding: 24rpx;
+	margin-bottom: 20rpx;
+	position: relative;
+	
+	&:last-child {
+		margin-bottom: 0;
+	}
+	
+	.coil-content {
+		display: flex;
+		flex: 1;
+		gap: 20rpx;
+		
+		.coil-index {
+			width: 60rpx;
+			height: 60rpx;
+			background: #34c759;
+			color: #fff;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 24rpx;
+			font-weight: bold;
+			flex-shrink: 0;
+		}
+		
+		.coil-info {
+			flex: 1;
+			
+			.coil-row {
+				display: flex;
+				margin-bottom: 8rpx;
+				
+				&:last-child {
+					margin-bottom: 0;
+				}
+				
+				.coil-label {
+					font-size: 24rpx;
+					color: #666;
+					min-width: 150rpx;
+				}
+				
+				.coil-value {
+					font-size: 24rpx;
+					color: #333;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+	
+	.coil-remove {
+		width: 60rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #ff4d4f;
+		font-size: 32rpx;
+		margin-left: 10rpx;
+		
+		&:active {
+			opacity: 0.6;
+		}
+	}
+}
+
+/* 表单卡片 */
+.form-card {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+
+.form-item {
+	margin-bottom: 30rpx;
+	
+	.form-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 15rpx;
+		font-weight: 500;
+		
+		&::before {
+			content: '*';
+			color: #ff4d4f;
+			margin-right: 6rpx;
+		}
+	}
+	
+	.form-label-optional {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 15rpx;
+		font-weight: 500;
+	}
+	
+	.form-input {
+		width: 100%;
+		height: 88rpx;
+		padding: 0 24rpx;
+		background: #f8f9fa;
+		border: 2rpx solid #e8e8e8;
+		border-radius: 12rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		transition: all 0.3s;
+		
+		&:focus {
+			background: #fff;
+			border-color: #34c759;
+		}
+	}
+	
+	.picker-input {
+		width: 100%;
+		height: 88rpx;
+		padding: 0 24rpx;
+		background: #f8f9fa;
+		border: 2rpx solid #e8e8e8;
+		border-radius: 12rpx;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		transition: all 0.3s;
+		
+		&:active {
+			background: #fff;
+			border-color: #34c759;
+		}
+		
+		.picker-text {
+			flex: 1;
+			font-size: 28rpx;
+			color: #333;
+			
+			&.picker-placeholder {
+				color: #999;
+			}
+		}
+		
+		.picker-arrow {
+			font-size: 24rpx;
+			color: #999;
+			margin-left: 10rpx;
+		}
+	}
+}
+
+/* 操作者信息 */
+.operator-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx 0;
+	margin-top: 20rpx;
+	
+	.operator-label {
+		font-size: 26rpx;
+		color: #999;
+	}
+	
+	.operator-name {
+		font-size: 26rpx;
+		color: #34c759;
+		font-weight: 500;
+	}
+}
+
+/* 操作按钮 */
+.action-buttons {
+	display: flex;
+	gap: 20rpx;
+	margin-top: 30rpx;
+	
+	.btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 12rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		border: none;
+		transition: all 0.2s;
+		
+		&:active {
+			transform: scale(0.98);
+		}
+		
+		&[disabled] {
+			opacity: 0.6;
+		}
+	}
+	
+	.btn-secondary {
+		background: #f5f5f5;
+		color: #666;
+	}
+	
+	.btn-primary {
+		background: linear-gradient(135deg, #34c759 0%, #30b350 100%);
+		color: #fff;
+		box-shadow: 0 4rpx 16rpx rgba(52, 199, 89, 0.3);
+	}
+}
+
+/* 提示卡片 */
+.tip-card {
+	background: #fff3cd;
+	border-radius: 12rpx;
+	padding: 30rpx;
+	text-align: center;
+	
+	.tip-text {
+		font-size: 26rpx;
+		color: #856404;
+	}
+}
+
+/* 库区选择弹窗 */
+.warehouse-popup {
+	background: #fff;
+	border-radius: 24rpx 24rpx 0 0;
+	max-height: 70vh;
+	
+	.popup-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.popup-title {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+		}
+		
+		.popup-close {
+			font-size: 40rpx;
+			color: #999;
+			width: 60rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	
+	.popup-search {
+		padding: 20rpx 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.search-input {
+			width: 100%;
+			height: 80rpx;
+			padding: 0 20rpx;
+			background: #f8f9fa;
+			border: 2rpx solid #e8e8e8;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			
+			&:focus {
+				background: #fff;
+				border-color: #34c759;
+			}
+		}
+	}
+	
+	.popup-body {
+		max-height: 400rpx;
+		
+		.warehouse-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 30rpx;
+			border-bottom: 1rpx solid #f5f5f5;
+			
+			&:last-child {
+				border-bottom: none;
+			}
+			
+			&:active {
+				background: #e8f5e8;
+			}
+			
+			.warehouse-name {
+				flex: 1;
+				font-size: 28rpx;
+				color: #333;
+			}
+			
+			.warehouse-check {
+				font-size: 32rpx;
+				color: #34c759;
+				font-weight: bold;
+			}
+		}
+		
+		.empty-tip {
+			text-align: center;
+			padding: 60rpx 0;
+			color: #999;
+			font-size: 28rpx;
+		}
+	}
+}
+</style>
diff --git a/apps/hand-factory/components/panels/code/trace.vue b/apps/hand-factory/components/panels/code/trace.vue
index 44da829..f303d4a 100644
--- a/apps/hand-factory/components/panels/code/trace.vue
+++ b/apps/hand-factory/components/panels/code/trace.vue
@@ -1,21 +1,852 @@
 <template>
-	<view class="">
+	<view class="trace-container">
+		<!-- 扫码或输入 -->
+		<view class="search-section">
+			<view class="search-card">
+				<view class="card-title">
+					<text class="title-dot"></text>
+					<text class="title-text">钢卷溯源</text>
+				</view>
+				
+				<!-- 扫码按钮 -->
+				<view class="scan-btn" @click="handleScan">
+					<text class="scan-icon">📷</text>
+					<text class="scan-text">扫描二维码</text>
+				</view>
+				
+				<view class="divider">
+					<view class="divider-line"></view>
+					<text class="divider-text">或</text>
+					<view class="divider-line"></view>
+				</view>
+				
+				<!-- 输入框 -->
+				<view class="input-group">
+					<view class="input-item">
+						<text class="input-label">入场钢卷号</text>
+						<input 
+							v-model="searchForm.enterCoilNo" 
+							placeholder="请输入入场钢卷号" 
+							class="input-field"
+						/>
+					</view>
+					<view class="input-item">
+						<text class="input-label-optional">当前钢卷号（可选）</text>
+						<input 
+							v-model="searchForm.currentCoilNo" 
+							placeholder="可输入当前钢卷号筛选" 
+							class="input-field"
+						/>
+					</view>
+				</view>
+				
+				<!-- 查询按钮 -->
+				<button class="query-btn" @click="handleQuery" :disabled="loading">
+					{{ loading ? '查询中...' : '查询溯源' }}
+				</button>
+			</view>
+		</view>
 		
+		<!-- 溯源结果 -->
+		<view class="result-section" v-if="traceResult">
+			<!-- 二维码信息 -->
+			<view class="result-card">
+				<view class="card-title">
+					<text class="title-dot"></text>
+					<text class="title-text">二维码信息</text>
+				</view>
+				<view class="qrcode-info">
+					<view class="info-row">
+						<text class="info-label">主序列号：</text>
+						<text class="info-value">{{ (traceResult.qrcode && traceResult.qrcode.serialNumber) || '-' }}</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">创建时间：</text>
+						<text class="info-value">{{ (traceResult.qrcode && traceResult.qrcode.createTime) || '-' }}</text>
+					</view>
+					<view class="info-row" v-if="traceResult.all_qrcodes && traceResult.all_qrcodes.length > 1">
+						<text class="info-label">相关二维码：</text>
+						<text class="info-value">{{ traceResult.all_qrcodes.length }} 个</text>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 操作步骤 -->
+			<view class="result-card" v-if="traceResult.steps && traceResult.steps.length > 0">
+				<view class="card-title">
+					<text class="title-dot"></text>
+					<text class="title-text">操作步骤</text>
+				</view>
+				<view class="steps-timeline">
+					<view 
+						class="step-item" 
+						v-for="(step, index) in traceResult.steps" 
+						:key="index"
+					>
+						<view class="step-marker">
+							<view class="step-number">{{ step.display_step || step.step }}</view>
+							<view class="step-line" v-if="index < traceResult.steps.length - 1"></view>
+						</view>
+						<view class="step-content">
+							<view class="step-header">
+								<text class="step-action">{{ step.action }}</text>
+								<text class="step-operation" v-if="step.operation">{{ step.operation }}</text>
+							</view>
+							<view class="step-details">
+								<view class="detail-row" v-if="step.current_coil_no">
+									<text class="detail-label">当前钢卷号：</text>
+									<text class="detail-value">{{ step.current_coil_no }}</text>
+								</view>
+								<view class="detail-row" v-if="step.old_current_coil_no">
+									<text class="detail-label">原钢卷号：</text>
+									<text class="detail-value">{{ step.old_current_coil_no }}</text>
+								</view>
+								<view class="detail-row" v-if="step.new_current_coil_no">
+									<text class="detail-label">新钢卷号：</text>
+									<text class="detail-value">{{ step.new_current_coil_no }}</text>
+								</view>
+								<view class="detail-row" v-if="step.new_current_coil_nos">
+									<text class="detail-label">分卷列表：</text>
+									<view class="detail-value">
+										<view class="coil-tags">
+											<text 
+												class="coil-tag coil-tag-split" 
+												v-for="coilNo in step.new_current_coil_nos.split(',')" 
+												:key="coilNo"
+											>
+												{{ coilNo.trim() }}
+											</text>
+										</view>
+									</view>
+								</view>
+								<view class="detail-row" v-if="step.parent_coil_nos">
+									<text class="detail-label">合卷来源：</text>
+									<view class="detail-value">
+										<view class="coil-tags">
+											<text 
+												class="coil-tag coil-tag-merge" 
+												v-for="coilNo in step.parent_coil_nos.split(',')" 
+												:key="coilNo"
+											>
+												{{ coilNo.trim() }}
+											</text>
+										</view>
+									</view>
+								</view>
+								<view class="detail-row" v-if="step.child_coils && step.child_coils.length > 0">
+									<text class="detail-label">子钢卷：</text>
+									<view class="detail-value">
+										<view class="coil-tags">
+											<text 
+												class="coil-tag coil-tag-child" 
+												v-for="coilNo in step.child_coils" 
+												:key="coilNo"
+											>
+												{{ coilNo }}
+											</text>
+										</view>
+									</view>
+								</view>
+								<view class="detail-row" v-if="step.qrcode_serial">
+									<text class="detail-label">二维码序列：</text>
+									<text class="detail-value">{{ step.qrcode_serial }}</text>
+								</view>
+								<view class="detail-row" v-if="step.operator">
+									<text class="detail-label">操作者：</text>
+									<text class="detail-value">{{ step.operator }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 钢卷分支图 -->
+			<view class="result-card" v-if="traceResult.records && traceResult.records.length > 0">
+				<view class="card-title">
+					<text class="title-dot"></text>
+					<text class="title-text">钢卷分支图</text>
+				</view>
+				<view class="branch-view">
+					<view 
+						class="branch-item" 
+						v-for="(record, index) in groupedRecords" 
+						:key="index"
+					>
+						<view class="branch-header">
+							<view class="branch-type" :class="['branch-' + record.type, 'operation-' + record.groupColor]">
+								{{ record.title }}
+							</view>
+							<text class="branch-count">{{ record.coils.length }} 个钢卷</text>
+						</view>
+						<view class="branch-coils">
+							<view 
+								class="coil-card" 
+								v-for="coil in record.coils" 
+								:key="coil.coilId"
+							>
+								<view class="coil-header">
+									<text class="coil-no">{{ coil.currentCoilNo }}</text>
+									<view class="coil-status" :class="'status-' + coil.dataType">
+										{{ coil.dataType === 1 ? '当前' : '历史' }}
+									</view>
+								</view>
+								<view class="coil-info">
+									<text class="coil-detail">入场号：{{ coil.enterCoilNo }}</text>
+									<text class="coil-detail" v-if="coil.team">班组：{{ coil.team }}</text>
+									<text class="coil-detail" v-if="coil.warehouse">
+										库区：{{ coil.warehouse.warehouseName }}
+									</text>
+									<text class="coil-detail">{{ coil.createTime }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 	</view>
 	
+			<!-- 无记录提示 -->
+			<view class="empty-tip" v-if="!traceResult.records || traceResult.records.length === 0">
+				<text>未找到相关钢卷记录</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+import { getGenerateRecord } from '@/api/wms/code.js'
+import { getMaterialCoilTrace, getMaterialCoil } from '@/api/wms/coil.js'
+
 	export default {
 		data() {
 			return {
-				columns: [
+			searchForm: {
+				enterCoilNo: '',
+				currentCoilNo: ''
+			},
+			traceResult: null,
+			loading: false
+		}
+	},
+	
+	computed: {
+		// 按时间线和分支关系分组钢卷记录
+		groupedRecords() {
+			if (!this.traceResult || !this.traceResult.records) {
+				return [];
+			}
+			
+			const groups = [];
+			
+			// 按创建时间排序所有记录
+			const sortedRecords = [...this.traceResult.records].sort((a, b) => 
+				new Date(a.createTime) - new Date(b.createTime)
+			);
+			
+			// 按数据类型分组，但保持时间顺序
+			const currentCoils = sortedRecords.filter(record => record.dataType === 1);
+			const historyCoils = sortedRecords.filter(record => record.dataType === 0);
+			
+			// 当前数据分组
+			if (currentCoils.length > 0) {
+				// 进一步按操作类型细分当前数据
+				const currentByOperation = this.groupByOperation(currentCoils);
+				groups.push(...currentByOperation);
+			}
+			
+			// 历史数据分组
+			if (historyCoils.length > 0) {
+				// 进一步按操作类型细分历史数据
+				const historyByOperation = this.groupByOperation(historyCoils, true);
+				groups.push(...historyByOperation);
+			}
+			
+			return groups;
+		}
+	},
+	
+	methods: {
+		// 按操作类型分组
+		groupByOperation(records, isHistory = false) {
+			const operationGroups = {};
+			
+			for (const record of records) {
+				let operationType = '原始数据';
+				let groupColor = 'default';
+				
+				if (record.hasMergeSplit === 1) {
+					operationType = '分卷结果';
+					groupColor = 'split';
+				} else if (record.hasMergeSplit === 2) {
+					operationType = '合卷结果';
+					groupColor = 'merge';
+				}
+				
+				const groupKey = operationType;
+				if (!operationGroups[groupKey]) {
+					operationGroups[groupKey] = {
+						operationType: operationType,
+						groupColor: groupColor,
+						coils: []
+					};
+				}
+				operationGroups[groupKey].coils.push(record);
+			}
+			
+			// 转换为数组
+			const groups = [];
+			for (const key in operationGroups) {
+				const group = operationGroups[key];
+				groups.push({
+					type: isHistory ? 'history' : 'current',
+					operationType: group.operationType,
+					groupColor: group.groupColor,
+					title: `${group.operationType}${isHistory ? '（历史）' : '（当前）'}`,
+					coils: group.coils
+				});
+			}
+			
+			return groups;
+		},
+		
+		// 扫码
+		handleScan() {
+			uni.scanCode({
+				success: async (res) => {
+					console.log('扫码结果：', res.result);
+					try {
+						const qrcodeId = res.result;
+						
+						// 1. 获取二维码详情
+						const qrcodeRes = await getGenerateRecord(qrcodeId);
+						if (qrcodeRes.code !== 200) {
+							throw new Error('未找到二维码记录');
+						}
+						
+						// 2. 解析content获取coil_id
+						const qrcodeRecord = qrcodeRes.data;
+						const content = JSON.parse(qrcodeRecord.content);
+						const coilId = content.coil_id;
+						
+						if (!coilId || coilId === 'null' || coilId === 'undefined') {
+							throw new Error('二维码中未包含有效的钢卷ID');
+						}
+						
+						// 3. 查询钢卷详情获取enterCoilNo
+						const coilRes = await getMaterialCoil(coilId);
+						if (coilRes.code !== 200 || !coilRes.data) {
+							throw new Error('未找到钢卷信息');
+						}
+						
+						const coilData = coilRes.data;
+						this.searchForm.enterCoilNo = coilData.enterCoilNo;
+						this.searchForm.currentCoilNo = '';
+						
+						// 4. 自动查询溯源
+						this.handleQuery();
+					} catch (err) {
+						console.error('扫码处理失败：', err);
+						uni.showToast({
+							title: err.message || '扫码信息解析失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				},
+				fail: (err) => {
+					console.error('扫码失败：', err);
+					uni.showToast({
+						title: '扫码失败，请重试',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		
+		// 查询溯源
+		handleQuery() {
+			// 验证
+			if (!this.searchForm.enterCoilNo) {
+				uni.showToast({ 
+					title: '请输入或扫描入场钢卷号', 
+					icon: 'none' 
+				});
+				return;
+			}
+			
+			this.loading = true;
+			
+			getMaterialCoilTrace(
+				this.searchForm.enterCoilNo, 
+				this.searchForm.currentCoilNo || undefined
+			).then(res => {
+				if (res.code === 200) {
+					this.traceResult = res.data;
+					console.log('溯源结果：', this.traceResult);
 					
-				]
+					if (!this.traceResult.records || this.traceResult.records.length === 0) {
+						uni.showToast({
+							title: '未找到相关记录',
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: '查询成功',
+							icon: 'success'
+						});
+					}
+				} else {
+					uni.showToast({
+						title: res.msg || '查询失败',
+						icon: 'none'
+					});
+				}
+			}).catch(err => {
+				console.error('查询失败：', err);
+				uni.showToast({
+					title: '查询失败，请重试',
+					icon: 'none'
+				});
+			}).finally(() => {
+				this.loading = false;
+			});
 			}
 		}
 	}
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style scoped lang="scss">
+.trace-container {
+	padding-bottom: 30rpx;
+}
+
+/* 搜索区域 */
+.search-section {
+	margin-bottom: 20rpx;
+}
+
+.search-card {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+
+.card-title {
+	display: flex;
+	align-items: center;
+	margin-bottom: 25rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+	
+	.title-dot {
+		width: 8rpx;
+		height: 28rpx;
+		background: #5856d6;
+		border-radius: 4rpx;
+		margin-right: 12rpx;
+	}
+	
+	.title-text {
+		flex: 1;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+}
+
+/* 扫码按钮 */
+.scan-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 20rpx;
+	height: 100rpx;
+	background: linear-gradient(135deg, #5856d6 0%, #4840c4 100%);
+	border-radius: 12rpx;
+	color: #fff;
+	box-shadow: 0 4rpx 12rpx rgba(88, 86, 214, 0.3);
+	
+	&:active {
+		transform: scale(0.98);
+	}
+	
+	.scan-icon {
+		font-size: 40rpx;
+	}
+	
+	.scan-text {
+		font-size: 28rpx;
+		font-weight: 500;
+	}
+}
+
+/* 分割线 */
+.divider {
+	display: flex;
+	align-items: center;
+	margin: 30rpx 0;
+	
+	.divider-line {
+		flex: 1;
+		height: 1rpx;
+		background: #e8e8e8;
+	}
+	
+	.divider-text {
+		padding: 0 20rpx;
+		font-size: 24rpx;
+		color: #999;
+	}
+}
+
+/* 输入组 */
+.input-group {
+	.input-item {
+		margin-bottom: 20rpx;
+		
+		&:last-child {
+			margin-bottom: 0;
+		}
+		
+		.input-label,
+		.input-label-optional {
+			display: block;
+			font-size: 26rpx;
+			color: #333;
+			margin-bottom: 12rpx;
+			font-weight: 500;
+		}
+		
+		.input-label::before {
+			content: '*';
+			color: #ff4d4f;
+			margin-right: 6rpx;
+		}
+		
+		.input-field {
+			width: 100%;
+			height: 80rpx;
+			padding: 0 20rpx;
+			background: #f8f9fa;
+			border: 2rpx solid #e8e8e8;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			
+			&:focus {
+				background: #fff;
+				border-color: #5856d6;
+			}
+		}
+	}
+}
+
+/* 查询按钮 */
+.query-btn {
+	width: 100%;
+	height: 88rpx;
+	margin-top: 30rpx;
+	background: linear-gradient(135deg, #5856d6 0%, #4840c4 100%);
+	color: #fff;
+	border-radius: 12rpx;
+	font-size: 30rpx;
+	font-weight: 500;
+	border: none;
+	box-shadow: 0 4rpx 16rpx rgba(88, 86, 214, 0.3);
+	
+	&:active {
+		transform: scale(0.98);
+	}
+	
+	&[disabled] {
+		opacity: 0.6;
+	}
+}
+
+/* 结果区域 */
+.result-section {
+	.result-card {
+		background: #fff;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	}
+}
+
+/* 二维码信息 */
+.qrcode-info {
+	.info-row {
+		display: flex;
+		padding: 20rpx 0;
+		border-bottom: 1rpx solid #f5f5f5;
+		
+		&:last-child {
+			border-bottom: none;
+		}
+		
+		.info-label {
+			font-size: 26rpx;
+			color: #666;
+			min-width: 150rpx;
+		}
+		
+		.info-value {
+			flex: 1;
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
+	}
+}
+
+/* 步骤时间线 */
+.steps-timeline {
+	.step-item {
+		display: flex;
+		gap: 20rpx;
+		
+		.step-marker {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			.step-number {
+				width: 60rpx;
+				height: 60rpx;
+				background: #5856d6;
+				color: #fff;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 24rpx;
+				font-weight: bold;
+				flex-shrink: 0;
+			}
+			
+			.step-line {
+				width: 2rpx;
+				flex: 1;
+				background: #e8e8e8;
+				margin: 10rpx 0;
+			}
+		}
+		
+		.step-content {
+			flex: 1;
+			padding-bottom: 30rpx;
+			
+			.step-header {
+				display: flex;
+				align-items: center;
+				gap: 15rpx;
+				margin-bottom: 15rpx;
+				
+				.step-action {
+					font-size: 28rpx;
+					font-weight: 600;
+					color: #333;
+				}
+				
+				.step-operation {
+					font-size: 24rpx;
+					color: #fff;
+					background: #5856d6;
+					padding: 4rpx 16rpx;
+					border-radius: 20rpx;
+				}
+			}
+			
+			.step-details {
+				background: #f8f9fa;
+				border-radius: 10rpx;
+				padding: 20rpx;
+				
+				.detail-row {
+					display: flex;
+					margin-bottom: 10rpx;
+					
+					&:last-child {
+						margin-bottom: 0;
+					}
+					
+					.detail-label {
+						font-size: 24rpx;
+						color: #666;
+						min-width: 140rpx;
+					}
+					
+					.detail-value {
+						flex: 1;
+						font-size: 24rpx;
+						color: #333;
+						word-break: break-all;
+					}
+				}
+				
+				.coil-tags {
+					display: flex;
+					flex-wrap: wrap;
+					gap: 10rpx;
+					
+					.coil-tag {
+						display: inline-block;
+						padding: 6rpx 16rpx;
+						border-radius: 20rpx;
+						font-size: 22rpx;
+						font-weight: 500;
+						
+						&.coil-tag-split {
+							background: #fff3e0;
+							color: #ff9500;
+							border: 1rpx solid #ffd591;
+						}
+						
+						&.coil-tag-merge {
+							background: #e8f5e8;
+							color: #34c759;
+							border: 1rpx solid #95de64;
+						}
+						
+						&.coil-tag-child {
+							background: #f0f7ff;
+							color: #007aff;
+							border: 1rpx solid #91d5ff;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+/* 分支视图 */
+.branch-view {
+	.branch-item {
+		margin-bottom: 30rpx;
+		
+		&:last-child {
+			margin-bottom: 0;
+		}
+		
+		.branch-header {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+			padding: 15rpx 20rpx;
+			background: #f8f9fa;
+			border-radius: 10rpx;
+			
+			.branch-type {
+				font-size: 26rpx;
+				font-weight: 600;
+				padding: 4rpx 16rpx;
+				border-radius: 20rpx;
+				
+				&.branch-current {
+					background: #d1f2eb;
+					color: #0c6957;
+				}
+				
+				&.branch-history {
+					background: #f8d7da;
+					color: #721c24;
+				}
+				
+				&.operation-split {
+					background: #fff3e0;
+					color: #ff9500;
+					border: 1rpx solid #ffd591;
+				}
+				
+				&.operation-merge {
+					background: #e8f5e8;
+					color: #34c759;
+					border: 1rpx solid #95de64;
+				}
+				
+				&.operation-default {
+					background: #f0f7ff;
+					color: #007aff;
+					border: 1rpx solid #91d5ff;
+				}
+			}
+			
+			.branch-count {
+				font-size: 24rpx;
+				color: #666;
+			}
+		}
+		
+		.branch-coils {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 15rpx;
+			
+			.coil-card {
+				flex: 1;
+				min-width: 300rpx;
+				background: #fff;
+				border: 2rpx solid #e8e8e8;
+				border-radius: 12rpx;
+				padding: 20rpx;
+				
+				.coil-header {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-bottom: 15rpx;
+					
+					.coil-no {
+						font-size: 28rpx;
+						font-weight: 600;
+						color: #333;
+					}
+					
+					.coil-status {
+						font-size: 20rpx;
+						padding: 4rpx 12rpx;
+						border-radius: 12rpx;
+						
+						&.status-1 {
+							background: #d1f2eb;
+							color: #0c6957;
+						}
+						
+						&.status-0 {
+							background: #f8d7da;
+							color: #721c24;
+						}
+					}
+				}
+				
+				.coil-info {
+					.coil-detail {
+						display: block;
+						font-size: 22rpx;
+						color: #666;
+						margin-bottom: 8rpx;
+						line-height: 1.4;
+						
+						&:last-child {
+							margin-bottom: 0;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+/* 空提示 */
+.empty-tip {
+	text-align: center;
+	padding: 80rpx 0;
+	color: #999;
+	font-size: 28rpx;
+}
+</style>
diff --git a/apps/hand-factory/components/panels/code/typing.vue b/apps/hand-factory/components/panels/code/typing.vue
index 35d21fa..064dc0f 100644
--- a/apps/hand-factory/components/panels/code/typing.vue
+++ b/apps/hand-factory/components/panels/code/typing.vue
@@ -1,238 +1,1099 @@
 <template>
-	<view class="container">
+	<view class="typing-container">
 		<!-- 扫码按钮 -->
-		<button class="scan-btn" @click="handleScan">点击扫码</button>
+		<view class="scan-section" v-if="!form.coilId">
+			<view class="scan-btn-wrapper" @click="handleScan">
+				<view class="scan-icon">
+					<text class="icon-camera">📷</text>
+				</view>
+				<text class="scan-tip">点击扫描二维码</text>
+			</view>
+		</view>
+		
+		<!-- 钢卷基本信息 -->
+		<view class="info-card" v-if="form.coilId">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">钢卷信息</text>
+				<view class="status-badge" :class="'status-' + coilDetail.dataType" v-if="coilDetail.dataType !== undefined">
+					{{ coilDetail.dataType === 1 ? '当前数据' : '历史数据' }}
+				</view>
+				<view class="more-btn" @click.stop="showBomDialog" v-if="bomItemList && bomItemList.length > 0">
+					<text class="icon-more">⚙</text>
+					<text class="more-text">参数</text>
+				</view>
+			</view>
+			
+			<view class="info-grid">
+				<view class="info-item">
+					<text class="item-label">入场钢卷号</text>
+					<text class="item-value">{{ coilDetail.enterCoilNo || '-' }}</text>
+				</view>
+				<view class="info-item">
+					<text class="item-label">当前库区</text>
+					<text class="item-value">{{ currentWarehouseName || '未分配' }}</text>
+				</view>
+				<view class="info-item" v-if="materialDetail">
+					<text class="item-label">原材料</text>
+					<text class="item-value">{{ materialDetail.rawMaterialName || '-' }}</text>
+				</view>
+				<view class="info-item" v-if="materialDetail">
+					<text class="item-label">规格</text>
+					<text class="item-value">{{ materialDetail.specification || '-' }}</text>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 历史数据提示 -->
+		<view class="warning-card" v-if="form.coilId && coilDetail.dataType === 0">
+			<view class="warning-icon">⚠️</view>
+			<view class="warning-content">
+				<text class="warning-title">历史数据</text>
+				<text class="warning-desc">此钢卷为历史数据，仅可查看，无法修改</text>
+			</view>
+		</view>
 		
 		<!-- 表单区域 -->
-		<uni-form ref="form" v-model="form" :rules="rules" v-if="form.coilId" label-width="160rpx">
-			<!-- 类型选择 -->
-			<uni-form-item label="物料类型" prop="itemType">
-				<uni-data-checkbox 
-					v-model="form.itemType" 
-					:localdata="[{ text: '原料', value: 'raw_material' }, { text: '产品', value: 'product' }]" 
+		<view class="form-card" v-if="form.coilId" @click="closeWarehouseList">
+			<view class="card-title">
+				<text class="title-dot"></text>
+				<text class="title-text">录入信息</text>
+			</view>
+			
+			<!-- 当前钢卷号 -->
+			<view class="form-item">
+				<text class="form-label">当前钢卷号</text>
+				<input 
+					v-model="form.currentCoilNo" 
+					placeholder="请输入当前钢卷号" 
+					class="form-input"
+					:disabled="coilDetail.dataType === 0"
+					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
 				/>
-			</uni-form-item>
+			</view>
 			
-			<!-- 物料选择 -->
-			<uni-form-item label="原料/产品" prop="itemId">
-				<klp-product-select 
-					:item-type="form.itemType" 
-					v-model="form.itemId"
-				></klp-product-select>
-			</uni-form-item>
-			
-			<!-- 班组输入 -->
-			<uni-form-item label="所属班组" prop="team">
+			<!-- 班组 -->
+			<view class="form-item">
+				<text class="form-label">班组</text>
 				<input 
 					v-model="form.team" 
 					placeholder="请输入班组名称" 
-					class="input-control"
+					class="form-input"
+					:disabled="coilDetail.dataType === 0"
+					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
 				/>
-			</uni-form-item>
+			</view>
 			
-			<!-- 卷号输入 -->
-			<uni-form-item label="当前卷号" prop="currentCoilNo">
-				<input 
-					v-model="form.currentCoilNo" 
-					placeholder="请输入卷号信息" 
-					class="input-control"
-				/>
-			</uni-form-item>
+			<!-- 库区选择 - 滚筒选择器 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">目标库区</text>
+				<view 
+					class="picker-input" 
+					@click="coilDetail.dataType !== 0 && showWarehousePicker()"
+					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
+				>
+					<text class="picker-text" :class="{ 'picker-placeholder': !currentWarehouseName }">
+						{{ currentWarehouseName || '请选择目标库区' }}
+					</text>
+					<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
+				</view>
+			</view>
 			
-			<!-- 毛重输入 -->
-			<uni-form-item label="毛重(kg)" prop="grossWeight">
+			<!-- 毛重 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">毛重 (kg)</text>
 				<input 
 					v-model="form.grossWeight" 
-					type="number" 
-					placeholder="请输入毛重" 
-					class="input-control"
+					type="digit"
+					placeholder="请输入毛重（选填）" 
+					class="form-input"
+					:disabled="coilDetail.dataType === 0"
+					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
 				/>
-			</uni-form-item>
+			</view>
 			
-			<!-- 净重输入 -->
-			<uni-form-item label="净重(kg)" prop="netWeight">
+			<!-- 净重 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">净重 (kg)</text>
 				<input 
 					v-model="form.netWeight" 
-					type="number" 
-					placeholder="请输入净重" 
-					class="input-control"
+					type="digit"
+					placeholder="请输入净重（选填）" 
+					class="form-input"
+					:disabled="coilDetail.dataType === 0"
+					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
 				/>
-			</uni-form-item>
+			</view>
 			
-			<!-- 确认按钮 -->
-			<uni-form-item>
-				<button class="confirm-btn" @click="handleConfirm">
-					确认信息并录入系统
+			<!-- 操作者信息 -->
+			<view class="operator-info">
+				<text class="operator-label">操作人：</text>
+				<text class="operator-name">{{ operatorName }}</text>
+			</view>
+			
+			<!-- 操作按钮 -->
+			<view class="action-buttons">
+				<button class="btn btn-secondary" @click="handleReset">重新扫码</button>
+				<button 
+					v-if="coilDetail.dataType === 1"
+					class="btn btn-primary" 
+					@click="handleConfirm" 
+					:disabled="loading"
+				>
+					{{ loading ? '提交中...' : '保存' }}
 				</button>
-			</uni-form-item>
-		</uni-form>
+			</view>
+		</view>
+		
+		<!-- 库区选择弹窗 -->
+		<uni-popup ref="warehousePopup" type="bottom">
+			<view class="warehouse-popup">
+				<view class="popup-header">
+					<text class="popup-title">选择库区</text>
+					<text class="popup-close" @click="closeWarehousePicker">✕</text>
+				</view>
+				<view class="popup-search">
+					<input 
+						v-model="warehouseSearchKeyword" 
+						@input="filterWarehousesInPicker"
+						placeholder="搜索库区名称" 
+						class="search-input"
+					/>
+				</view>
+				<scroll-view class="popup-body" scroll-y>
+					<view 
+						class="warehouse-item" 
+						v-for="warehouse in filteredWarehousesInPicker" 
+						:key="warehouse.warehouseId"
+						@click="selectWarehouseFromPicker(warehouse)"
+					>
+						<text class="warehouse-name">{{ warehouse.warehouseName }}</text>
+						<text class="warehouse-check" v-if="form.warehouseId === warehouse.warehouseId">✓</text>
+					</view>
+					<view class="empty-tip" v-if="!filteredWarehousesInPicker || filteredWarehousesInPicker.length === 0">
+						<text>未找到匹配的库区</text>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+		
+		<!-- BOM弹窗 -->
+		<uni-popup ref="bomPopup" type="bottom">
+			<view class="bom-popup">
+				<view class="popup-header">
+					<text class="popup-title">BOM 清单</text>
+					<text class="popup-close" @click="closeBomDialog">✕</text>
+				</view>
+				<scroll-view class="popup-body" scroll-y>
+					<view class="bom-item" v-for="(item, index) in bomItemList" :key="index">
+						<view class="bom-index">{{ index + 1 }}</view>
+						<view class="bom-content">
+							<view class="bom-row">
+								<text class="bom-label">{{ item.attrKey }}:</text>
+								<text class="bom-value">{{ item.attrValue }}</text>
+							</view>
+							<view class="bom-row" v-if="item.remark">
+								<text class="bom-label">备注:</text>
+								<text class="bom-value">{{ item.remark }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="empty-tip" v-if="!bomItemList || bomItemList.length === 0">
+						<text>暂无参数数据</text>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { getGenerateRecord } from '@/api/wms/code.js'
-	import { updateMaterialCoil } from '@/api/wms/coil.js'
+import { getGenerateRecord } from '@/api/wms/code.js'
+import { updateMaterialCoil, getMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil.js'
+import { listWarehouse } from '@/api/wms/warehouse.js'
+import { getRawMaterial } from '@/api/wms/rawMaterial.js'
+
+export default {
+	data() {
+		return {
+			form: {
+				coilId: undefined,
+				itemType: '',
+				itemId: undefined,
+				team: '',
+				currentCoilNo: '',
+				warehouseId: undefined,
+				warehouseName: '',
+				grossWeight: '',
+				netWeight: ''
+			},
+			coilDetail: {},
+			materialDetail: null,
+			bomItemList: [],
+			warehouses: [],
+			filteredWarehouses: [],
+			warehouseKeyword: '',
+			showWarehouseList: false,
+			currentWarehouseName: '',
+			warehouseSearchKeyword: '',
+			filteredWarehousesInPicker: [],
+			loading: false
+		}
+	},
 	
-	export default { 
-		data() {
-			return {
-				form: {
-					coilId: undefined,
-					itemType: 'raw_material',
-					itemId: undefined,
-					team: undefined,
-					currentCoilNo: undefined,
-					warehouseId: undefined,
-					grossWeight: undefined,
-					netWeight: undefined,
-				},
-				// 表单验证规则
-				rules: {
-					coilId: {
-						required: true,
-						message: '请先扫码获取卷ID',
-						trigger: ['change', 'blur']
-					},
-					itemType: {
-						required: true,
-						message: '请选择物料类型',
-						trigger: 'change'
-					},
-					itemId: {
-						required: true,
-						message: '请选择对应原料/产品',
-						trigger: 'change'
-					},
-					team: {
-						required: true,
-						message: '请输入所属班组',
-						trigger: 'blur'
-					},
-					currentCoilNo: {
-						required: true,
-						message: '请输入当前卷号',
-						trigger: 'blur'
-					},
-					grossWeight: {
-						required: true,
-						message: '请输入毛重',
-						trigger: 'blur',
-						type: 'number'
-					},
-					netWeight: {
-						required: true,
-						message: '请输入净重',
-						trigger: 'blur',
-						type: 'number'
-					}
+	computed: {
+		// 获取当前操作者昵称
+		operatorName() {
+			return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+		}
+	},
+	
+	onLoad() {
+		this.loadWarehouses();
+	},
+	
+	mounted() {
+		this.loadWarehouses();
+	},
+	
+	methods: {
+		// 加载库区列表
+		async loadWarehouses() {
+			console.log('开始加载库区...');
+			try {
+				const res = await listWarehouse({ pageNum: 1, pageSize: 1000 });
+				console.log("库区返回值", res);
+				if (res.code === 200) {
+					this.warehouses = res.data || [];
+					this.filteredWarehouses = this.warehouses;
+					console.log('库区加载成功，数量:', this.warehouses.length);
+				} else {
+					console.error('库区加载失败:', res.msg);
 				}
+			} catch (err) {
+				console.error('加载库区异常:', err);
 			}
 		},
-		methods: {
-			// 处理扫码逻辑
-			handleScan() {
-				uni.scanCode({
-					success: (res) => {
-						console.log('扫码结果：', res.result)
-						getGenerateRecord(res.result).then(res => {
-							const result = JSON.parse(res.data.content);
-							this.$set(this.form, 'coilId', result.coil_id);
-							// 扫码后验证coilId字段
-							this.$refs.form.validateField('coilId');
-							console.log('扫码获取的卷信息：', result);
-						}).catch(err => {
-							uni.showToast({
-								title: '扫码信息解析失败',
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-						console.error('扫码失败：', err)
+		
+		// 过滤库区
+		filterWarehouses() {
+			console.log('过滤库区，关键词:', this.warehouseKeyword);
+			console.log('当前库区列表:', this.warehouses);
+			const keyword = this.warehouseKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredWarehouses = this.warehouses;
+			} else {
+				this.filteredWarehouses = this.warehouses.filter(item => {
+					const name = (item.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+			console.log('过滤后库区数量:', this.filteredWarehouses.length);
+			this.showWarehouseList = true;
+		},
+		
+		// 选择库区
+		selectWarehouse(warehouse) {
+			this.form.warehouseId = warehouse.warehouseId;
+			this.form.warehouseName = warehouse.warehouseName;
+			this.warehouseKeyword = warehouse.warehouseName;
+			// 关闭搜索结果列表
+			this.$nextTick(() => {
+				this.showWarehouseList = false;
+			});
+		},
+		
+		// 显示库区选择器
+		showWarehousePicker() {
+			this.warehouseSearchKeyword = '';
+			this.filteredWarehousesInPicker = [...this.warehouses];
+			this.$refs.warehousePopup.open();
+		},
+		
+		// 关闭库区选择器
+		closeWarehousePicker() {
+			this.$refs.warehousePopup.close();
+		},
+		
+		// 在选择器中过滤库区
+		filterWarehousesInPicker() {
+			const keyword = this.warehouseSearchKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredWarehousesInPicker = [...this.warehouses];
+			} else {
+				this.filteredWarehousesInPicker = this.warehouses.filter(warehouse => {
+					const name = (warehouse.warehouseName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+		},
+		
+		// 从选择器中选择库区
+		selectWarehouseFromPicker(warehouse) {
+			this.form.warehouseId = warehouse.warehouseId;
+			this.form.warehouseName = warehouse.warehouseName;
+			this.currentWarehouseName = warehouse.warehouseName;
+			this.closeWarehousePicker();
+		},
+		
+		// 扫码
+		handleScan() {
+			uni.scanCode({
+				success: async (res) => {
+					console.log('扫码结果：', res.result);
+					try {
+						// 扫码结果是二维码ID (recordId)
+						const qrcodeId = res.result;
+						
+						// 1. 通过二维码ID获取二维码详情
+						const qrcodeRes = await getGenerateRecord(qrcodeId);
+						if (qrcodeRes.code !== 200) {
+							throw new Error('未找到二维码记录');
+						}
+						
+						// 2. 解析二维码的content，获取enter_coil_no和current_coil_no
+						const qrcodeRecord = qrcodeRes.data;
+						const content = JSON.parse(qrcodeRecord.content);
+						const enterCoilNo = content.enter_coil_no;
+						const currentCoilNo = content.current_coil_no;
+						
+						if (!enterCoilNo) {
+							throw new Error('二维码中未包含有效的入场钢卷号');
+						}
+						
+						// 3. 通过入场钢卷号和当前钢卷号查询最新的钢卷详情
+						// 使用追溯接口来获取准确的钢卷信息
+						const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
+						if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records.length === 0) {
+							throw new Error('未找到钢卷信息');
+						}
+						
+						// 4. 从追溯结果中找到当前数据（dataType = 1）且匹配当前钢卷号的记录
+						let coilData = null;
+						for (const record of traceRes.data.records) {
+							if (record.dataType === 1 && record.currentCoilNo === currentCoilNo) {
+								coilData = record;
+								break;
+							}
+						}
+						
+						// 如果没有找到精确匹配的，取第一个当前数据
+						if (!coilData) {
+							for (const record of traceRes.data.records) {
+								if (record.dataType === 1) {
+									coilData = record;
+									break;
+								}
+							}
+						}
+						
+						// 如果还是没有找到，取第一个记录（可能是历史数据）
+						if (!coilData) {
+							coilData = traceRes.data.records[0];
+						}
+						
+						// 保存钢卷详情
+						this.coilDetail = coilData;
+						
+						// 填充表单数据
+						this.form.coilId = coilData.coilId;
+						this.form.currentCoilNo = coilData.currentCoilNo || '';
+						this.form.team = coilData.team || '';
+						this.form.itemType = coilData.itemType || '';
+						this.form.itemId = coilData.itemId;
+						this.form.warehouseId = coilData.warehouseId;
+						this.form.grossWeight = coilData.grossWeight || '';
+						this.form.netWeight = coilData.netWeight || '';
+						
+						// 设置当前库区名称（用于显示）
+						if (coilData.warehouse && coilData.warehouse.warehouseName) {
+							this.currentWarehouseName = coilData.warehouse.warehouseName;
+						}
+						
+						// 保存原材料详情
+						if (coilData.rawMaterial) {
+							this.materialDetail = coilData.rawMaterial;
+						}
+						
+						// 保存BOM项目列表
+						if (coilData.bomItemList) {
+							this.bomItemList = coilData.bomItemList;
+						}
+						
+						console.log('钢卷详情：', coilData);
 						uni.showToast({
-							title: '扫码失败，请重试',
-							icon: 'none'
-						})
+							title: '扫码成功',
+							icon: 'success'
+						});
+					} catch (err) {
+						console.error('扫码处理失败：', err);
+						uni.showToast({
+							title: err.message || '扫码信息解析失败',
+							icon: 'none',
+							duration: 2000
+						});
 					}
-				})
-			},
+				},
+				fail: (err) => {
+					console.error('扫码失败：', err);
+					uni.showToast({
+						title: '扫码失败，请重试',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		
+		// 显示BOM弹窗
+		showBomDialog() {
+			this.$refs.bomPopup.open();
+		},
+		
+		// 关闭BOM弹窗
+		closeBomDialog() {
+			this.$refs.bomPopup.close();
+		},
+		
+		// 关闭库区搜索列表
+		closeWarehouseList() {
+			this.showWarehouseList = false;
+		},
+		
+		// 重新扫码
+		handleReset() {
+			uni.showModal({
+				title: '确认重新扫码',
+				content: '是否要清空当前数据并重新扫码？',
+				success: (res) => {
+					if (res.confirm) {
+						this.form = {
+							coilId: undefined,
+							itemType: '',
+							itemId: undefined,
+							team: '',
+							currentCoilNo: '',
+							warehouseId: undefined,
+							warehouseName: '',
+							grossWeight: '',
+							netWeight: ''
+						};
+						this.coilDetail = {};
+						this.materialDetail = null;
+						this.bomItemList = [];
+						this.warehouseKeyword = '';
+						this.currentWarehouseName = '';
+						this.filteredWarehouses = this.warehouses;
+					}
+				}
+			});
+		},
+		
+		// 提交
+		handleConfirm() {
+			// 历史数据不允许修改
+			if (this.coilDetail.dataType === 0) {
+				uni.showToast({ title: '历史数据不允许修改', icon: 'none' });
+				return;
+			}
 			
-			// 处理确认提交
-			handleConfirm() {
-				// 表单验证
-				this.$refs.form.validate(valid => {
-					if (valid) {
-						// 验证通过，提交数据
-						updateMaterialCoil(this.form).then(res => {
-							uni.showToast({
-								title: '录入成功',
-								icon: 'success'
-							})
-							// 重置表单
-							this.$refs.form.resetFields();
-						}).catch(err => {
-							console.error('提交失败：', err)
-							uni.showToast({
-								title: '录入失败，请重试',
-								icon: 'none'
-							})
-						})
-					} else {
-						// 验证失败，不提交
-						return false;
-					}
-				})
+			// 验证必填项
+			if (!this.form.currentCoilNo) {
+				uni.showToast({ title: '请输入当前钢卷号', icon: 'none' });
+				return;
+			}
+			if (!this.form.team) {
+				uni.showToast({ title: '请输入班组', icon: 'none' });
+				return;
+			}
+			
+			this.loading = true;
+			const submitData = {
+				coilId: this.form.coilId,
+				enterCoilNo: this.coilDetail.enterCoilNo, // 添加入场钢卷号
+				supplierCoilNo: this.coilDetail.supplierCoilNo, // 保留厂家原料卷号
+				currentCoilNo: this.form.currentCoilNo,
+				itemType: this.form.itemType,
+				itemId: this.form.itemId,
+				team: this.form.team,
+				warehouseId: this.form.warehouseId,
+				grossWeight: this.form.grossWeight ? Number(this.form.grossWeight) : null,
+				netWeight: this.form.netWeight ? Number(this.form.netWeight) : null
+			};
+			
+			updateMaterialCoil(submitData).then(res => {
+				if (res.code === 200) {
+					uni.showToast({
+						title: '保存成功',
+						icon: 'success'
+					});
+					setTimeout(() => {
+						this.handleReset();
+					}, 1500);
+				} else {
+					uni.showToast({
+						title: res.msg || '保存失败',
+						icon: 'none'
+					});
+				}
+			}).catch(err => {
+				console.error('提交失败：', err);
+				uni.showToast({
+					title: '保存失败，请重试',
+					icon: 'none'
+				});
+			}).finally(() => {
+				this.loading = false;
+			});
+		}
+	}
+}
+</script>
+
+<style scoped lang="scss">
+.typing-container {
+	padding-bottom: 30rpx;
+}
+
+/* 扫码区域 */
+.scan-section {
+	padding: 80rpx 40rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	
+	.scan-btn-wrapper {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 30rpx;
+		
+		.scan-icon {
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 50%;
+			background: linear-gradient(135deg, #007aff 0%, #0051d5 100%);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-shadow: 0 8rpx 24rpx rgba(0, 122, 255, 0.3);
+			
+			&:active {
+				transform: scale(0.95);
+			}
+		}
+		
+		.icon-camera {
+			font-size: 70rpx;
+		}
+		
+		.scan-tip {
+			font-size: 28rpx;
+			color: #666;
+		}
+	}
+}
+
+/* 卡片样式 */
+.info-card,
+.material-card,
+.form-card {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+
+/* 警告卡片 */
+.warning-card {
+	background: #fff2f0;
+	border: 2rpx solid #ffccc7;
+	border-radius: 16rpx;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	display: flex;
+	align-items: center;
+	gap: 20rpx;
+	
+	.warning-icon {
+		font-size: 48rpx;
+		flex-shrink: 0;
+	}
+	
+	.warning-content {
+		flex: 1;
+		
+		.warning-title {
+			display: block;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #cf1322;
+			margin-bottom: 8rpx;
+		}
+		
+		.warning-desc {
+			display: block;
+			font-size: 24rpx;
+			color: #a8071a;
+			line-height: 1.4;
+		}
+	}
+}
+
+.card-title {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 25rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+	
+	.title-dot {
+		width: 8rpx;
+		height: 28rpx;
+		background: #007aff;
+		border-radius: 4rpx;
+		margin-right: 12rpx;
+	}
+	
+	.title-text {
+		flex: 1;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+	
+	.status-badge {
+		font-size: 22rpx;
+		padding: 4rpx 12rpx;
+		border-radius: 12rpx;
+		margin-right: 10rpx;
+		
+		&.status-1 {
+			background: #d1f2eb;
+			color: #0c6957;
+		}
+		
+		&.status-0 {
+			background: #f8d7da;
+			color: #721c24;
+		}
+	}
+	
+	.more-btn {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		padding: 8rpx 16rpx;
+		background: #f0f7ff;
+		border-radius: 20rpx;
+		border: 1rpx solid #007aff;
+		
+		.icon-more {
+			font-size: 24rpx;
+			color: #007aff;
+		}
+		
+		.more-text {
+			font-size: 24rpx;
+			color: #007aff;
+		}
+	}
+}
+
+/* 信息网格 */
+.info-grid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20rpx;
+	
+	.info-item {
+		flex: 1;
+		min-width: 45%;
+		background: #f8f9fa;
+		padding: 20rpx;
+		border-radius: 12rpx;
+		
+		.item-label {
+			display: block;
+			font-size: 24rpx;
+			color: #999;
+			margin-bottom: 10rpx;
+		}
+		
+		.item-value {
+			display: block;
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 500;
+		}
+	}
+}
+
+/* 详情网格 */
+.detail-grid {
+	.detail-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 0;
+		border-bottom: 1rpx solid #f5f5f5;
+		
+		&:last-child {
+			border-bottom: none;
+		}
+		
+		.detail-label {
+			font-size: 28rpx;
+			color: #666;
+		}
+		
+		.detail-value {
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 500;
+		}
+	}
+}
+
+/* 表单项 */
+.form-item {
+	margin-bottom: 30rpx;
+	
+	&:last-of-type {
+		margin-bottom: 0;
+	}
+	
+	.form-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 15rpx;
+		font-weight: 500;
+		
+		&::before {
+			content: '*';
+			color: #ff4d4f;
+			margin-right: 6rpx;
+		}
+	}
+	
+	.form-label-optional {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 15rpx;
+		font-weight: 500;
+	}
+	
+	.form-input {
+		width: 100%;
+		height: 88rpx;
+		padding: 0 24rpx;
+		background: #f8f9fa;
+		border: 2rpx solid #e8e8e8;
+		border-radius: 12rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		transition: all 0.3s;
+		
+		&:focus {
+			background: #fff;
+			border-color: #007aff;
+		}
+		
+		&.form-input-disabled {
+			background: #f5f5f5;
+			color: #999;
+			cursor: not-allowed;
+		}
+	}
+}
+
+/* 选择器输入框 */
+.picker-input {
+	width: 100%;
+	height: 88rpx;
+	padding: 0 24rpx;
+	background: #f8f9fa;
+	border: 2rpx solid #e8e8e8;
+	border-radius: 12rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	transition: all 0.3s;
+	
+	&:active {
+		background: #fff;
+		border-color: #007aff;
+	}
+	
+	&.picker-input-disabled {
+		background: #f5f5f5;
+		color: #999;
+		cursor: not-allowed;
+	}
+	
+	.picker-text {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333;
+		
+		&.picker-placeholder {
+			color: #999;
+		}
+	}
+	
+	.picker-arrow {
+		font-size: 24rpx;
+		color: #999;
+		margin-left: 10rpx;
+	}
+}
+
+/* 库区选择弹窗 */
+.warehouse-popup {
+	background: #fff;
+	border-radius: 24rpx 24rpx 0 0;
+	max-height: 70vh;
+	
+	.popup-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.popup-title {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+		}
+		
+		.popup-close {
+			font-size: 40rpx;
+			color: #999;
+			width: 60rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	
+	.popup-search {
+		padding: 20rpx 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.search-input {
+			width: 100%;
+			height: 80rpx;
+			padding: 0 20rpx;
+			background: #f8f9fa;
+			border: 2rpx solid #e8e8e8;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			
+			&:focus {
+				background: #fff;
+				border-color: #007aff;
 			}
 		}
 	}
-</script>
+	
+	.popup-body {
+		max-height: 400rpx;
+		
+		.warehouse-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 30rpx;
+			border-bottom: 1rpx solid #f5f5f5;
+			
+			&:last-child {
+				border-bottom: none;
+			}
+			
+			&:active {
+				background: #f0f7ff;
+			}
+			
+			.warehouse-name {
+				flex: 1;
+				font-size: 28rpx;
+				color: #333;
+			}
+			
+			.warehouse-check {
+				font-size: 32rpx;
+				color: #007aff;
+				font-weight: bold;
+			}
+		}
+		
+		.empty-tip {
+			text-align: center;
+			padding: 60rpx 0;
+			color: #999;
+			font-size: 28rpx;
+		}
+	}
+}
 
-<style>
-	.container {
-		padding: 30rpx 20rpx;
+/* 操作者信息 */
+.operator-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx 0;
+	margin-top: 20rpx;
+	
+	.operator-label {
+		font-size: 26rpx;
+		color: #999;
 	}
 	
-	/* 扫码按钮样式 */
-	.scan-btn {
-		width: 600rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		font-size: 36rpx;
-		background-color: #007aff;
-		color: white;
-		border-radius: 50rpx;
-		margin: 0 auto 60rpx;
-		display: block;
-		box-shadow: 0 4rpx 10rpx rgba(0, 122, 255, 0.3);
+	.operator-name {
+		font-size: 26rpx;
+		color: #007aff;
+		font-weight: 500;
+	}
+}
+
+/* 操作按钮 */
+.action-buttons {
+	display: flex;
+	gap: 20rpx;
+	margin-top: 30rpx;
+	
+	.btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 12rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		border: none;
+		transition: all 0.2s;
+		
+		&:active {
+			transform: scale(0.98);
+		}
+		
+		&[disabled] {
+			opacity: 0.6;
+		}
 	}
 	
-	/* 输入框样式 */
-	.input-control {
-		width: 100%;
-		height: 80rpx;
-		line-height: 80rpx;
-		border: 1px solid #eee;
-		border-radius: 8rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		font-size: 32rpx;
+	.btn-secondary {
+		background: #f5f5f5;
+		color: #666;
 	}
 	
-	/* 确认按钮样式 */
-	.confirm-btn {
-		width: 100%;
-		height: 90rpx;
-		line-height: 90rpx;
-		font-size: 32rpx;
-		background-color: #00b42a;
-		color: white;
-		border-radius: 10rpx;
-		margin-top: 30rpx;
-		box-shadow: 0 2rpx 8rpx rgba(0, 180, 42, 0.2);
+	.btn-primary {
+		background: linear-gradient(135deg, #007aff 0%, #0051d5 100%);
+		color: #fff;
+		box-shadow: 0 4rpx 16rpx rgba(0, 122, 255, 0.3);
+	}
+}
+
+/* BOM弹窗 */
+.bom-popup {
+	background: #fff;
+	border-radius: 24rpx 24rpx 0 0;
+	max-height: 70vh;
+	
+	.popup-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+		
+		.popup-title {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+		}
+		
+		.popup-close {
+			font-size: 40rpx;
+			color: #999;
+			width: 60rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
 	}
 	
-	/* 表单项间距 */
-	.uni-form-item {
-		margin-bottom: 30rpx !important;
+	.popup-body {
+		padding: 30rpx;
+		max-height: 500rpx;
+		
+		.bom-item {
+			display: flex;
+			gap: 20rpx;
+			padding: 24rpx;
+			background: #f8f9fa;
+			border-radius: 12rpx;
+			margin-bottom: 20rpx;
+			
+			&:last-child {
+				margin-bottom: 0;
+			}
+			
+			.bom-index {
+				width: 60rpx;
+				height: 60rpx;
+				background: #007aff;
+				color: #fff;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 24rpx;
+				font-weight: bold;
+				flex-shrink: 0;
+			}
+			
+			.bom-content {
+				flex: 1;
+				
+				.bom-row {
+					display: flex;
+					margin-bottom: 10rpx;
+					
+					&:last-child {
+						margin-bottom: 0;
+					}
+					
+					.bom-label {
+						font-size: 26rpx;
+						color: #666;
+						min-width: 120rpx;
+					}
+					
+					.bom-value {
+						font-size: 26rpx;
+						color: #333;
+						font-weight: 500;
+					}
+				}
+			}
+		}
+		
+		.empty-tip {
+			text-align: center;
+			padding: 60rpx 0;
+			color: #999;
+			font-size: 28rpx;
+		}
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index ae83d65..2ed0e74 100644
--- a/apps/hand-factory/config.js
+++ b/apps/hand-factory/config.js
@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://140.143.206.120/prod-api',
+  baseUrl: 'http://192.168.31.116:8080',
   // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {
diff --git a/apps/hand-factory/pages/code/code.vue b/apps/hand-factory/pages/code/code.vue
index 2e0a019..98060e7 100644
--- a/apps/hand-factory/pages/code/code.vue
+++ b/apps/hand-factory/pages/code/code.vue
@@ -1,5 +1,6 @@
 <template>
-	<view class="content">
+	<view class="industrial-content">
+		
 		<!-- 标签栏 -->
 		<view class="tab-container">
 			<view 
@@ -9,11 +10,12 @@
 				class="tab-item"
 				:class="{ 'tab-active': currentTab === item.value }"
 			>
-				{{ item.label }}
+				<text class="tab-label">{{ item.label }}</text>
+				<view class="tab-indicator" v-if="currentTab === item.value"></view>
 			</view>
 		</view>
 		
-		<!-- 动态组件区域 - 根据当前标签显示对应组件 -->
+		<!-- 动态组件区域 -->
 		<view class="component-container">
 			<component 
 				:is="currentComponent" 
@@ -23,151 +25,160 @@
 </template>
 
 <script>
-	import ApartVue from '@/components/panels/code/apart.vue'
-	import MergeVue from '@/components/panels/code/merge.vue'
-	import TraceVue from '@/components/panels/code/trace.vue'
-	import TypingVue from '@/components/panels/code/typing.vue'
+import ApartVue from '@/components/panels/code/apart.vue'
+import MergeVue from '@/components/panels/code/merge.vue'
+import TraceVue from '@/components/panels/code/trace.vue'
+import TypingVue from '@/components/panels/code/typing.vue'
 
-	export default {
-		data() {
-			return {
-				scanResult: null, // 扫码结果（传递给组件）
-				currentTime: '', // 扫码时间（传递给组件）
-				recordId: undefined,
-				codeStatus: undefined,
-				remark: '',
-				currentTab: 'typing', // 当前激活的标签
-				tabs: [
-					{ label: '录入', value: 'typing' },
-					{ label: '分卷', value: 'apart' },
-					// { label: '合卷', value: 'merge' },
-					{ label: '追溯', value: 'trace' }
-				]
+export default {
+	data() {
+		return {
+			scanResult: null,
+			currentTime: '',
+			recordId: undefined,
+			codeStatus: undefined,
+			remark: '',
+			currentTab: 'typing',
+			tabs: [
+				{ label: '录入', value: 'typing' },
+				{ label: '分卷', value: 'apart' },
+				{ label: '合卷', value: 'merge' },
+				{ label: '追溯', value: 'trace' }
+			]
+		};
+	},
+	components: {
+		TypingVue,
+		ApartVue,
+		MergeVue,
+		TraceVue
+	},
+	computed: {
+		username() {
+			return this.$store.state.user.name
+		},
+		avatar() {
+			return this.$store.state.user.avatar
+		},
+		windowHeight() {
+			return uni.getSystemInfoSync().windowHeight - 50
+		},
+		currentComponent() {
+			const componentMap = {
+				'typing': 'TypingVue',
+				'apart': 'ApartVue',
+				'merge': 'MergeVue',
+				'trace': 'TraceVue'
 			};
-		},
-		components: {
-			ApartVue,
-			MergeVue,
-			TraceVue,
-			TypingVue
-		},
-		computed: {
-			username() {
-				return this.$store.state.user.name
-			},
-			avatar() {
-				return this.$store.state.user.avatar
-			},
-			windowHeight() {
-				return uni.getSystemInfoSync().windowHeight - 50
-			},
-			// 根据当前标签计算要显示的组件
-			currentComponent() {
-				// 转换为组件名（如 'typing' -> 'TypingVue'）
-				return this.currentTab.charAt(0).toUpperCase() + this.currentTab.slice(1) + 'Vue'
-			}
-		},
-		
-		onLoad() {
-			uni.setNavigationBarTitle({
-			  title: '扫码（' + this.username + '）',
-			});
-		},
-		
-		methods: {
-			// 切换标签
-			switchTab(tabValue) {
-				this.currentTab = tabValue
-			},
-			
-			// 处理确认录入
-			handleConfirm() {
-				if (!this.scanResult && this.currentTab !== 'trace') {
-					uni.showToast({
-						title: '请先扫码获取信息',
-						icon: 'none'
-					})
-					return
-				}
-				
-				// 这里添加确认录入的逻辑
-				console.log('确认录入信息：', {
-					tab: this.currentTab,
-					scanResult: this.scanResult,
-					currentTime: this.currentTime,
-					recordId: this.recordId,
-					codeStatus: this.codeStatus,
-					remark: this.remark,
-					operator: this.username
-				})
-				
-				uni.showToast({
-					title: '录入成功',
-					icon: 'success'
-				})
-			}
+			return componentMap[this.currentTab] || 'TypingVue';
+		}
+	},
+	
+	onLoad() {
+		uni.setNavigationBarTitle({
+			title: '扫码（' + this.username + '）',
+		});
+	},
+	
+	methods: {
+		// 切换标签
+		switchTab(tabValue) {
+			this.currentTab = tabValue
 		}
 	}
+}
 </script>
 
-<style>
-	/* 父页面样式：保留原有样式，新增标签栏样式 */
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: flex-start;
-		padding: 20rpx;
-		min-height: 100vh;
-		background-color: #f5f5f5;
-	}
+<style scoped lang="scss">
+.industrial-content {
+	min-height: 100vh;
+	background: #f6f6f6;
+	padding-bottom: 30rpx;
+}
 
-	/* 标签栏容器 */
-	.tab-container {
-		display: flex;
-		width: 100%;
-		background-color: #fff;
-		border-radius: 10rpx;
-		overflow: hidden;
-		margin-bottom: 30rpx;
-	}
-
-	/* 标签项样式 */
-	.tab-item {
-		flex: 1;
-		text-align: center;
-		padding: 25rpx 0;
-		font-size: 32rpx;
-		color: #666;
-		position: relative;
-		transition: all 0.3s;
-	}
-
-	/* 激活标签样式 */
-	.tab-active {
-		color: #007aff;
+/* 顶部装饰 */
+.header-decoration {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 40rpx 30rpx 30rpx;
+	margin-bottom: 20rpx;
+	
+	.decorative-text {
+		font-size: 28rpx;
 		font-weight: 500;
+		color: #333;
+		letter-spacing: 2rpx;
+		padding: 0 30rpx;
 	}
+	
+	.decorative-line {
+		height: 2rpx;
+		background: linear-gradient(90deg, transparent, #ddd, transparent);
+		flex: 1;
+		max-width: 100rpx;
+		
+		&.line-left {
+			background: linear-gradient(90deg, transparent, #ddd);
+		}
+		
+		&.line-right {
+			background: linear-gradient(90deg, #ddd, transparent);
+		}
+	}
+}
 
-	/* 激活标签下划线 */
-	.tab-active::after {
-		content: '';
+/* 简约标签栏 */
+.tab-container {
+	display: flex;
+	width: 100%;
+	background: #fff;
+	padding: 0 20rpx;
+	margin-bottom: 20rpx;
+	position: relative;
+	border-bottom: 1rpx solid #e8e8e8;
+}
+
+.tab-item {
+	flex: 1;
+	text-align: center;
+	padding: 30rpx 0;
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	transition: all 0.3s ease;
+	
+	.tab-label {
+		font-size: 28rpx;
+		color: #666;
+		font-weight: 400;
+		transition: all 0.3s ease;
+	}
+	
+	&.tab-active {
+		.tab-label {
+			color: #007aff;
+			font-weight: 600;
+		}
+	}
+	
+	.tab-indicator {
 		position: absolute;
 		bottom: 0;
-		left: 0;
-		width: 100%;
-		height: 6rpx;
-		background-color: #007aff;
-		border-radius: 3rpx 3rpx 0 0;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 50rpx;
+		height: 4rpx;
+		background: #007aff;
+		border-radius: 2rpx;
 	}
+}
 
-	/* 组件容器样式 */
-	.component-container {
-		width: 100%;
-		min-height: 400rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-		padding: 30rpx;
-		margin-bottom: 40rpx;
-	}
-</style>
\ No newline at end of file
+/* 组件容器 */
+.component-container {
+	width: 100%;
+	min-height: 400rpx;
+	padding: 0 30rpx;
+}
+</style>
diff --git a/apps/hand-factory/pages/index.vue b/apps/hand-factory/pages/index.vue
index 82a8202..1b95d09 100644
--- a/apps/hand-factory/pages/index.vue
+++ b/apps/hand-factory/pages/index.vue
@@ -1,8 +1,9 @@
 <template>
-	<view>
-		<klp-header @lineChange="setActive"></klp-header>
+	<view class="production-page">
 		
-		<view class="">
+		<klp-header @lineChange="setActive" class="line-header"></klp-header>
+		
+		<view class="content-wrapper">
 			<Acidity v-if="active == 0"/>
 			<Paint v-else-if="active == 1"/>
 			<Zinc1 v-else-if="active == 2"></Zinc1>
@@ -13,36 +14,84 @@
 </template>
 
 <script>
-	import Acidity from '@/components/lines/acidity.vue'
-	import Paint from '@/components/lines/paint.vue'
-	import Zinc1 from '@/components/lines/zinc1.vue'
-	import Zinc2 from '@/components/lines/zinc2.vue'
-	import Zinc3 from '@/components/lines/zinc3.vue'
-	
-	export default {
-		components: {
-			Acidity,
-			Paint,
-			Zinc1,
-			Zinc2,
-			Zinc3
-		},
-		data() {
-			return {
-				active: 0
+import Acidity from '@/components/lines/acidity.vue'
+import Paint from '@/components/lines/paint.vue'
+import Zinc1 from '@/components/lines/zinc1.vue'
+import Zinc2 from '@/components/lines/zinc2.vue'
+import Zinc3 from '@/components/lines/zinc3.vue'
+
+export default {
+	components: {
+		Acidity,
+		Paint,
+		Zinc1,
+		Zinc2,
+		Zinc3
+	},
+	data() {
+		return {
+			active: 0
+		}
+	},
+	methods: {
+		next() {
+			if (this.active >= 5) {
+				this.active = 0
+			} else {
+				this.active += 1
 			}
 		},
-		methods: {
-			next() {
-				if (this.active >= 5) {
-					this.active = 0
-				} else {
-					this.active += 1
-				}
-			},
-			setActive({ index, line }) {
-				this.active = index;
-			}
+		setActive({ index, line }) {
+			this.active = index;
 		}
 	}
-</script>
\ No newline at end of file
+}
+</script>
+
+<style scoped lang="scss">
+.production-page {
+	min-height: 100vh;
+	background: #f6f6f6;
+}
+
+/* 顶部装饰 */
+.page-header {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 40rpx 30rpx 20rpx;
+	background: #fff;
+	border-bottom: 1rpx solid #e8e8e8;
+	
+	.header-title {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333;
+		letter-spacing: 2rpx;
+		padding: 0 30rpx;
+	}
+	
+	.header-line {
+		height: 2rpx;
+		background: linear-gradient(90deg, transparent, #ddd, transparent);
+		flex: 1;
+		max-width: 100rpx;
+		
+		&.line-left {
+			background: linear-gradient(90deg, transparent, #ddd);
+		}
+		
+		&.line-right {
+			background: linear-gradient(90deg, #ddd, transparent);
+		}
+	}
+}
+
+.line-header {
+	background: #fff;
+}
+
+.content-wrapper {
+	padding: 20rpx;
+}
+</style>
diff --git a/apps/hand-factory/pages/mine/index.vue b/apps/hand-factory/pages/mine/index.vue
index dff9cc9..7965153 100644
--- a/apps/hand-factory/pages/mine/index.vue
+++ b/apps/hand-factory/pages/mine/index.vue
@@ -79,7 +79,7 @@
 		</view>
 
 	</view>
-	</view>
+
 </template>
 
 <script>
diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js
index d925832..83c73ea 100644
--- a/apps/hand-factory/utils/update.js
+++ b/apps/hand-factory/utils/update.js
@@ -30,7 +30,6 @@ function getIgnoredVersion() {
 }
 
 function setIgnoredVersion(version) {
-  uni.setStorageSync('ignoredVersion', version);
   console.log('已设置忽略版本:', version);
 }