diff --git a/apps/hand-factory/App.vue b/apps/hand-factory/App.vue
index ca4d332..d262251 100644
--- a/apps/hand-factory/App.vue
+++ b/apps/hand-factory/App.vue
@@ -6,7 +6,7 @@
   export default {
     onLaunch: function() { 
       this.initApp()
-			updateManager.checkUpdate(); 
+			// updateManager.checkUpdate(); 
     },
     methods: {
       // 初始化应用
@@ -33,7 +33,7 @@
 					this.$tab.reLaunch('/pages/login') 
 					return;
         }
-				this.$store.dispatch('GetInfo')
+				
       }
     }
   }
diff --git a/apps/hand-factory/api/wms/actualWarehouse.js b/apps/hand-factory/api/wms/actualWarehouse.js
new file mode 100644
index 0000000..b9edb67
--- /dev/null
+++ b/apps/hand-factory/api/wms/actualWarehouse.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询实际库区/库位自关联列表
+export function listActualWarehouse(query) {
+  return request({
+    url: '/wms/actualWarehouse/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实际库区/库位自关联详细
+export function getActualWarehouse(actualWarehouseId) {
+  return request({
+    url: '/wms/actualWarehouse/' + actualWarehouseId,
+    method: 'get'
+  })
+}
+
+// 新增实际库区/库位自关联
+export function addActualWarehouse(data) {
+  return request({
+    url: '/wms/actualWarehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改实际库区/库位自关联
+export function updateActualWarehouse(data) {
+  return request({
+    url: '/wms/actualWarehouse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除实际库区/库位自关联
+export function delActualWarehouse(actualWarehouseId) {
+  return request({
+    url: '/wms/actualWarehouse/' + actualWarehouseId,
+    method: 'delete'
+  })
+}
diff --git a/apps/hand-factory/components/klp-warehouse-picker/klp-warehouse-picker.vue b/apps/hand-factory/components/klp-warehouse-picker/klp-warehouse-picker.vue
new file mode 100644
index 0000000..0f97665
--- /dev/null
+++ b/apps/hand-factory/components/klp-warehouse-picker/klp-warehouse-picker.vue
@@ -0,0 +1,425 @@
+<template>
+  <view>
+    <!-- 选择器触发按钮 -->
+    <view 
+      class="picker-input" 
+      @click="handleOpen"
+      :class="{ 'picker-input-disabled': disabled }"
+    >
+      <text class="picker-text" :class="{ 'picker-placeholder': !selectedName }">
+        {{ selectedName || placeholder }}
+      </text>
+      <text class="picker-arrow" v-if="!disabled">▼</text>
+    </view>
+
+    <!-- 弹窗内容 -->
+    <uni-popup ref="popup" type="bottom" @close="handlePopupClose">
+      <view class="warehouse-popup">
+        <!-- 弹窗头部 -->
+        <view class="popup-header">
+          <text class="popup-title">{{ title || (wareType === 'virtual' ? '选择逻辑库区' : '选择真实库区') }}</text>
+          <text class="popup-close" @click="handleClose">✕</text>
+        </view>
+        
+        <!-- 加载状态 -->
+        <view class="loading-tip" v-if="loading">
+          <uni-loading type="circle" size="24"></uni-loading>
+          <text class="loading-text">加载库区中...</text>
+        </view>
+
+        <!-- 搜索框 -->
+        <view class="popup-search" v-if="!loading">
+          <input 
+            v-model="searchKeyword" 
+            @input="handleSearch"
+            placeholder="搜索库区名称" 
+            class="search-input"
+          />
+        </view>
+        
+        <!-- 库区列表 -->
+        <scroll-view class="popup-body" scroll-y v-if="!loading">
+          <view 
+            class="warehouse-item" 
+            v-for="item in filteredList" 
+            :key="getItemId(item)"
+            @click="handleSelect(item)"
+          >
+            <text class="warehouse-name">{{ getItemName(item) }}</text>
+            <text class="warehouse-check" v-if="getItemId(item) === selectedId">✓</text>
+          </view>
+          <view class="empty-tip" v-if="filteredList.length === 0">
+            <text>未找到匹配的库区</text>
+          </view>
+        </scroll-view>
+
+        <!-- 错误提示 -->
+        <view class="error-tip" v-if="error">
+          <text class="error-icon">⚠️</text>
+          <text class="error-text">{{ errorMsg || '加载库区失败' }}</text>
+          <button class="retry-btn" @click="loadWarehouses">重试</button>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import { listWarehouse } from '@/api/wms/warehouse.js'
+import { listActualWarehouse } from '@/api/wms/actualWarehouse.js'
+
+export default {
+  name: 'WarehousePicker',
+  props: {
+    // 已选中的库区ID（用于回显）
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    // 禁用状态
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    // 按钮占位文本
+    placeholder: {
+      type: String,
+      default: '请选择库区'
+    },
+    // 弹窗标题
+    title: {
+      type: String,
+      default: ''
+    },
+    // 库区类型：virtual-逻辑库区，actual-真实库区
+    wareType: {
+      type: String,
+      default: 'virtual',
+      validator: (value) => {
+        return ['virtual', 'actual'].includes(value)
+      }
+    }
+  },
+  data() {
+    return {
+      // 弹窗显示状态
+      showPopup: false,
+      // 所有库区列表
+      dataList: [],
+      // 过滤后的库区列表
+      filteredList: [],
+      // 搜索关键词
+      searchKeyword: '',
+      // 加载状态
+      loading: false,
+      // 错误状态
+      error: false,
+      // 错误信息
+      errorMsg: '',
+      // 选中的库区名称（用于显示）
+      selectedName: ''
+    }
+  },
+  computed: {
+    // 选中的库区ID（双向绑定）
+    selectedId: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    }
+  },
+  watch: {
+    // 监听选中值变化，更新显示名称
+    value: {
+      immediate: true,
+      handler(val) {
+        if (val && this.dataList.length) {
+          const matched = this.dataList.find(item => this.getItemId(item) === val)
+          this.selectedName = matched ? this.getItemName(matched) : ''
+        }
+      }
+    },
+    // 监听库区类型变化，重新加载数据
+    wareType: {
+      immediate: true,
+      handler() {
+        this.loadWarehouses()
+      }
+    }
+  },
+  methods: {
+    // 根据类型获取项目ID
+    getItemId(item) {
+      return this.wareType === 'virtual' ? item.warehouseId : item.actualWarehouseId
+    },
+    
+    // 根据类型获取项目名称
+    getItemName(item) {
+      return this.wareType === 'virtual' ? item.warehouseName : item.actualWarehouseName
+    },
+    
+    // 加载库区列表
+    async loadWarehouses() {
+      if (this.loading) return
+      
+      this.loading = true
+      this.error = false
+      this.errorMsg = ''
+      
+      try {
+        // 根据类型选择不同的API
+        const res = this.wareType === 'virtual' 
+          ? await listWarehouse({ pageNum: 1, pageSize: 1000 })
+          : await listActualWarehouse({ pageNum: 1, pageSize: 1000 })
+        
+        if (res.code === 200) {
+          this.dataList = res[this.wareType === 'virtual' ? 'data' : 'rows'] || []
+          this.filteredList = [...this.dataList]
+          // 初始化选中项名称
+          this.updateSelectedName()
+        } else {
+          throw new Error(res.msg || `${this.wareType === 'virtual' ? '逻辑' : '真实'}库区数据加载失败`)
+        }
+      } catch (err) {
+        this.error = true
+        this.errorMsg = err.message
+        console.error(`${this.wareType === 'virtual' ? '逻辑' : '真实'}库区加载失败:`, err)
+      } finally {
+        this.loading = false
+      }
+    },
+    
+    // 更新选中的库区名称
+    updateSelectedName() {
+      if (!this.selectedId) return
+      
+      const matched = this.dataList.find(
+        item => this.getItemId(item) === this.selectedId
+      )
+      this.selectedName = matched ? this.getItemName(matched) : ''
+    },
+    
+    // 搜索过滤
+    handleSearch() {
+      const keyword = this.searchKeyword.trim().toLowerCase()
+      if (!keyword) {
+        this.filteredList = [...this.dataList]
+      } else {
+        this.filteredList = this.dataList.filter(item => 
+          this.getItemName(item).toLowerCase().includes(keyword)
+        )
+      }
+    },
+    
+    // 选择库区
+    handleSelect(item) {
+      this.selectedId = this.getItemId(item)
+      this.selectedName = this.getItemName(item)
+      // 通知父组件选中的完整信息
+      this.$emit('change', item)
+      this.handleClose()
+    },
+    
+    // 打开弹窗
+    handleOpen() {
+      if (this.disabled) return
+      // 每次打开前重置搜索
+      this.searchKeyword = ''
+      this.filteredList = [...this.dataList]
+      this.showPopup = true
+      this.$refs.popup.open()
+    },
+    
+    // 关闭弹窗
+    handleClose() {
+      this.showPopup = false
+      this.$refs.popup.close()
+    },
+    
+    // 弹窗关闭回调
+    handlePopupClose() {
+      this.showPopup = false
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+/* 保持原有样式不变 */
+.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;
+  }
+}
+
+.loading-tip {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 60rpx 0;
+  gap: 16rpx;
+  
+  .loading-text {
+    font-size: 28rpx;
+    color: #666;
+  }
+}
+
+.error-tip {
+  padding: 40rpx 30rpx;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 20rpx;
+  
+  .error-icon {
+    font-size: 48rpx;
+    color: #ff4d4f;
+  }
+  
+  .error-text {
+    font-size: 28rpx;
+    color: #ff4d4f;
+    max-width: 80%;
+  }
+  
+  .retry-btn {
+    margin-top: 10rpx;
+    padding: 10rpx 30rpx;
+    background: #007aff;
+    color: #fff;
+    border-radius: 20rpx;
+    font-size: 26rpx;
+  }
+}
+
+.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;
+    }
+  }
+}
+
+.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>
\ No newline at end of file
diff --git a/apps/hand-factory/components/panels/code/apart.vue b/apps/hand-factory/components/panels/code/apart.vue
index 7e3ff4a..4584282 100644
--- a/apps/hand-factory/components/panels/code/apart.vue
+++ b/apps/hand-factory/components/panels/code/apart.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="apart-container">
-    <!-- 扫码按钮 -->
+		<!-- 扫码按钮 -->
 		<view class="scan-section" v-if="!form.coilId">
 			<view class="scan-btn-wrapper" @click="handleScan">
 				<view class="scan-icon">
@@ -9,17 +9,18 @@
 				<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="more-btn" @click.stop="showBomDialog" v-if="coilDetail.bomItemList && coilDetail.bomItemList.length > 0">
+				<view class="more-btn" @click.stop="showBomDialog"
+					v-if="coilDetail.bomItemList && coilDetail.bomItemList.length > 0">
 					<text class="icon-more">⚙</text>
 					<text class="more-text">参数</text>
 				</view>
-      </view>
+			</view>
 
 			<view class="info-grid">
 				<view class="info-item">
@@ -35,8 +36,8 @@
 					<text class="item-value">{{ (coilDetail.warehouse && coilDetail.warehouse.warehouseName) || '未分配' }}</text>
 				</view>
 			</view>
-        </view>
-		
+		</view>
+
 
 		<!-- 分卷列表 -->
 		<view class="form-card" v-if="form.coilId" @click="closeWarehouseList">
@@ -44,180 +45,120 @@
 				<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)"
-					>
+					<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)"
-					>
+					<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-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"
-							/>
+							<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"
-							/>
+							<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 class="split-field">
+							<text class="field-label-optional">目标库位</text>
+							<klp-warehouse-picker v-model="item.warehouseId" placeholder="请选择目标库区" />
+							<!-- <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>
-					
-					<!-- 物品类型选择 -->
-					<view class="split-field">
-						<text class="field-label-optional">物品类型</text>
-						<view 
-							class="picker-input" 
-							@click="showItemTypePickerForItem(index)"
-						>
-							<text class="picker-text" :class="{ 'picker-placeholder': !item.itemType }">
-								{{ item.itemType === 'product' ? '成品' : item.itemType === 'raw_material' ? '原料' : '请选择物品类型' }}
-							</text>
-							<text class="picker-arrow">▼</text>
-						</view>
-					</view>
-					
-					<!-- 产品选择（仅当选择了成品类型时显示） -->
-					<view class="split-field" v-if="item.itemType === 'product'">
-						<text class="field-label-optional">选择产品</text>
-						<view 
-							class="picker-input" 
-							@click="showProductPickerForItem(index)"
-						>
-							<text class="picker-text" :class="{ 'picker-placeholder': !item.productName }">
-								{{ item.productName || '请选择产品' }}
-							</text>
-							<text class="picker-arrow">▼</text>
-						</view>
-					</view>
-					
-					<!-- 原材料选择（仅当选择了原料类型时显示） -->
-					<view class="split-field" v-if="item.itemType === 'raw_material'">
-						<text class="field-label-optional">选择原材料</text>
-						<view 
-							class="picker-input" 
-							@click="showRawMaterialPickerForItem(index)"
-						>
-							<text class="picker-text" :class="{ 'picker-placeholder': !item.rawMaterialName }">
-								{{ item.rawMaterialName || '请选择原材料' }}
-							</text>
-							<text class="picker-arrow">▼</text>
-						</view>
-					</view>
 						
+						<view class="split-field">
+							<text class="field-label-optional">实际库区</text>
+							<klp-warehouse-picker v-model="item.actualWarehouseId" placeholder="请选择实际库区" ware-type="actual" />
+							<!-- <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">物品类型</text>
+							<view class="picker-input" @click="showItemTypePickerForItem(index)">
+								<text class="picker-text" :class="{ 'picker-placeholder': !item.itemType }">
+									{{ item.itemType === 'product' ? '成品' : item.itemType === 'raw_material' ? '原料' : '请选择物品类型' }}
+								</text>
+								<text class="picker-arrow">▼</text>
+							</view>
+						</view>
+
+						<!-- 产品选择（仅当选择了成品类型时显示） -->
+						<view class="split-field" v-if="item.itemType === 'product'">
+							<text class="field-label-optional">选择产品</text>
+							<view class="picker-input" @click="showProductPickerForItem(index)">
+								<text class="picker-text" :class="{ 'picker-placeholder': !item.productName }">
+									{{ item.productName || '请选择产品' }}
+								</text>
+								<text class="picker-arrow">▼</text>
+							</view>
+						</view>
+
+						<!-- 原材料选择（仅当选择了原料类型时显示） -->
+						<view class="split-field" v-if="item.itemType === 'raw_material'">
+							<text class="field-label-optional">选择原材料</text>
+							<view class="picker-input" @click="showRawMaterialPickerForItem(index)">
+								<text class="picker-text" :class="{ 'picker-placeholder': !item.rawMaterialName }">
+									{{ item.rawMaterialName || '请选择原材料' }}
+								</text>
+								<text class="picker-arrow">▼</text>
+							</view>
+						</view>
+
 						<view class="split-field">
 							<text class="field-label-optional">毛重 (吨)</text>
-          <input 
-								v-model="item.grossWeight" 
-								type="digit"
-								placeholder="请输入毛重（选填）" 
-								class="field-input"
-							/>
+							<input v-model="item.grossWeight" type="digit" placeholder="请输入毛重（选填）" class="field-input" />
 						</view>
 						<view class="split-field">
 							<text class="field-label-optional">净重 (吨)</text>
-          <input 
-								v-model="item.netWeight" 
-								type="digit"
-								placeholder="请输入净重（选填）" 
-								class="field-input"
-							/>
+							<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>
 
 			<!-- 操作按钮 -->
 			<view class="action-buttons">
 				<button class="btn btn-secondary" @click="handleReset">重新扫码</button>
 				<button class="btn btn-primary" @click="handleConfirm" :disabled="loading">
 					{{ loading ? '提交中...' : '确认分卷' }}
-        </button>
+				</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>
-		
+
 		<!-- 产品选择弹窗 -->
 		<uni-popup ref="productPopup" type="bottom">
 			<view class="warehouse-popup">
@@ -226,22 +167,15 @@
 					<text class="popup-close" @click="closeProductPickerForItem">✕</text>
 				</view>
 				<view class="popup-search">
-					<input 
-						v-model="productSearchKeyword" 
-						@input="filterProductsInPicker"
-						placeholder="搜索产品名称" 
-						class="search-input"
-					/>
+					<input v-model="productSearchKeyword" @input="filterProductsInPicker" placeholder="搜索产品名称"
+						class="search-input" />
 				</view>
 				<scroll-view class="popup-body" scroll-y>
-					<view 
-						class="warehouse-item" 
-						v-for="product in filteredProductsInPicker" 
-						:key="product.productId"
-						@click="selectProductFromPicker(product)"
-					>
+					<view class="warehouse-item" v-for="product in filteredProductsInPicker" :key="product.productId"
+						@click="selectProductFromPicker(product)">
 						<text class="warehouse-name">{{ product.productName }}</text>
-						<text class="warehouse-check" v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemId === product.productId">✓</text>
+						<text class="warehouse-check"
+							v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemId === product.productId">✓</text>
 					</view>
 					<view class="empty-tip" v-if="!filteredProductsInPicker || filteredProductsInPicker.length === 0">
 						<text>未找到匹配的产品</text>
@@ -249,7 +183,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- 原材料选择弹窗 -->
 		<uni-popup ref="rawMaterialPopup" type="bottom">
 			<view class="warehouse-popup">
@@ -258,22 +192,15 @@
 					<text class="popup-close" @click="closeRawMaterialPickerForItem">✕</text>
 				</view>
 				<view class="popup-search">
-					<input 
-						v-model="rawMaterialSearchKeyword" 
-						@input="filterRawMaterialsInPicker"
-						placeholder="搜索原材料名称" 
-						class="search-input"
-					/>
+					<input v-model="rawMaterialSearchKeyword" @input="filterRawMaterialsInPicker" placeholder="搜索原材料名称"
+						class="search-input" />
 				</view>
 				<scroll-view class="popup-body" scroll-y>
-					<view 
-						class="warehouse-item" 
-						v-for="material in filteredRawMaterialsInPicker" 
-						:key="material.rawMaterialId"
-						@click="selectRawMaterialFromPicker(material)"
-					>
+					<view class="warehouse-item" v-for="material in filteredRawMaterialsInPicker" :key="material.rawMaterialId"
+						@click="selectRawMaterialFromPicker(material)">
 						<text class="warehouse-name">{{ material.rawMaterialName }}</text>
-						<text class="warehouse-check" v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemId === material.rawMaterialId">✓</text>
+						<text class="warehouse-check"
+							v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemId === material.rawMaterialId">✓</text>
 					</view>
 					<view class="empty-tip" v-if="!filteredRawMaterialsInPicker || filteredRawMaterialsInPicker.length === 0">
 						<text>未找到匹配的原材料</text>
@@ -281,7 +208,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- 物品类型选择弹窗 -->
 		<uni-popup ref="itemTypePopup" type="bottom">
 			<view class="warehouse-popup">
@@ -292,16 +219,18 @@
 				<scroll-view class="popup-body" scroll-y>
 					<view class="warehouse-item" @click="selectItemType('product')">
 						<text class="warehouse-name">成品</text>
-						<text class="warehouse-check" v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemType === 'product'">✓</text>
+						<text class="warehouse-check"
+							v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemType === 'product'">✓</text>
 					</view>
 					<view class="warehouse-item" @click="selectItemType('raw_material')">
 						<text class="warehouse-name">原料</text>
-						<text class="warehouse-check" v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemType === 'raw_material'">✓</text>
+						<text class="warehouse-check"
+							v-if="currentPickerItemIndex !== -1 && splitCoils[currentPickerItemIndex].itemType === 'raw_material'">✓</text>
 					</view>
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- BOM弹窗 -->
 		<uni-popup ref="bomPopup" type="bottom">
 			<view class="bom-popup">
@@ -329,1161 +258,1120 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-  </view>
+	</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'
-import { listProduct } from '@/api/wms/product.js'
-import { listRawMaterial } from '@/api/wms/rawMaterial.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 {
+		listProduct
+	} from '@/api/wms/product.js'
+	import {
+		listRawMaterial
+	} from '@/api/wms/rawMaterial.js'
 
-export default {
-  data() {
-    return {
-      form: {
-        coilId: undefined,
-				hasMergeSplit: 1 // 1表示分卷
-			},
-		coilDetail: {},
-		splitCoils: [
-			{ 
-				currentCoilNo: '', 
-				team: '',
-				hasMergeSplit: 1,
-				warehouseId: undefined,
-				warehouseName: '',
-				warehouseKeyword: '',
-				filteredWarehouses: [],
-				showWarehouseList: false,
-				itemType: '',
-				itemId: undefined,
-				productName: '',
-				rawMaterialName: '',
-				grossWeight: '',
-				netWeight: ''
-			},
-			{ 
-				currentCoilNo: '', 
-				team: '',
-				hasMergeSplit: 1,
-            warehouseId: undefined,
-				warehouseName: '',
-				warehouseKeyword: '',
-				filteredWarehouses: [],
-				showWarehouseList: false,
-				itemType: '',
-				itemId: undefined,
-				productName: '',
-				rawMaterialName: '',
-				grossWeight: '',
-				netWeight: ''
+	export default {
+		data() {
+			return {
+				form: {
+					coilId: undefined,
+					hasMergeSplit: 1 // 1表示分卷
+				},
+				coilDetail: {},
+				splitCoils: [{
+						currentCoilNo: '',
+						team: '',
+						hasMergeSplit: 1,
+						warehouseId: undefined,
+						actualWarehouseId: undefined,
+						warehouseName: '',
+						warehouseKeyword: '',
+						filteredWarehouses: [],
+						showWarehouseList: false,
+						itemType: '',
+						itemId: undefined,
+						productName: '',
+						rawMaterialName: '',
+						grossWeight: '',
+						netWeight: ''
+					},
+					{
+						currentCoilNo: '',
+						team: '',
+						hasMergeSplit: 1,
+						warehouseId: undefined,
+						actualWarehouseId: undefined,
+						warehouseName: '',
+						warehouseKeyword: '',
+						filteredWarehouses: [],
+						showWarehouseList: false,
+						itemType: '',
+						itemId: undefined,
+						productName: '',
+						rawMaterialName: '',
+						grossWeight: '',
+						netWeight: ''
+					}
+				],
+				warehouses: [],
+				warehouseSearchKeyword: '',
+				filteredWarehousesInPicker: [],
+				products: [], // 产品列表
+				productSearchKeyword: '',
+				filteredProductsInPicker: [],
+				rawMaterials: [], // 原材料列表
+				rawMaterialSearchKeyword: '',
+				filteredRawMaterialsInPicker: [],
+				currentPickerItemIndex: -1,
+				loading: false
 			}
-		],
-			warehouses: [],
-			warehouseSearchKeyword: '',
-			filteredWarehousesInPicker: [],
-			products: [], // 产品列表
-			productSearchKeyword: '',
-			filteredProductsInPicker: [],
-			rawMaterials: [], // 原材料列表
-			rawMaterialSearchKeyword: '',
-			filteredRawMaterialsInPicker: [],
-			currentPickerItemIndex: -1,
-			loading: false
-		}
-	},
-	
-	computed: {
-		operatorName() {
-			return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
-		}
-	},
-	
-	onLoad() {
-		this.loadWarehouses();
-		this.loadProducts();
-		this.loadRawMaterials();
-	},
-	
-	mounted() {
-		this.loadWarehouses();
-		this.loadProducts();
-		this.loadRawMaterials();
-	},
-	
-	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];
+		},
+
+		computed: {
+			operatorName() {
+				return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+			}
+		},
+
+		onLoad() {
+			this.loadProducts();
+			this.loadRawMaterials();
+		},
+
+		mounted() {
+			this.loadProducts();
+			this.loadRawMaterials();
+		},
+
+		methods: {
+			// 加载产品列表
+			async loadProducts() {
+				console.log('开始加载产品列表...');
+				try {
+					const res = await listProduct({
+						pageNum: 1,
+						pageSize: 1000
 					});
-					console.log('分卷库区列表初始化完成');
-				} else {
-					console.error('库区加载失败:', res.msg);
+					console.log("产品返回值", res);
+					if (res.code === 200) {
+						this.products = res.rows || res.data || [];
+						this.filteredProductsInPicker = this.products;
+						console.log('产品加载成功，数量:', this.products.length);
+					} else {
+						console.error('产品加载失败:', res.msg);
+					}
+				} catch (err) {
+					console.error('加载产品异常:', err);
 				}
-			} catch (err) {
-				console.error('加载库区异常:', err);
-			}
-		},
-		
-		// 加载产品列表
-		async loadProducts() {
-			console.log('开始加载产品列表...');
-			try {
-				const res = await listProduct({ pageNum: 1, pageSize: 1000 });
-				console.log("产品返回值", res);
-				if (res.code === 200) {
-					this.products = res.rows || res.data || [];
-					this.filteredProductsInPicker = this.products;
-					console.log('产品加载成功，数量:', this.products.length);
-				} else {
-					console.error('产品加载失败:', res.msg);
+			},
+
+			// 加载原材料列表
+			async loadRawMaterials() {
+				console.log('开始加载原材料列表...');
+				try {
+					const res = await listRawMaterial({
+						pageNum: 1,
+						pageSize: 1000
+					});
+					console.log("原材料返回值", res);
+					if (res.code === 200) {
+						this.rawMaterials = res.rows || res.data || [];
+						this.filteredRawMaterialsInPicker = this.rawMaterials;
+						console.log('原材料加载成功，数量:', this.rawMaterials.length);
+					} else {
+						console.error('原材料加载失败:', res.msg);
+					}
+				} catch (err) {
+					console.error('加载原材料异常:', err);
 				}
-			} catch (err) {
-				console.error('加载产品异常:', err);
-			}
-		},
-		
-		// 加载原材料列表
-		async loadRawMaterials() {
-			console.log('开始加载原材料列表...');
-			try {
-				const res = await listRawMaterial({ pageNum: 1, pageSize: 1000 });
-				console.log("原材料返回值", res);
-				if (res.code === 200) {
-					this.rawMaterials = res.rows || res.data || [];
-					this.filteredRawMaterialsInPicker = this.rawMaterials;
-					console.log('原材料加载成功，数量:', this.rawMaterials.length);
-				} else {
-					console.error('原材料加载失败:', res.msg);
+			},
+
+			// 显示物品类型选择器
+			showItemTypePickerForItem(index) {
+				this.currentPickerItemIndex = index;
+				this.$refs.itemTypePopup.open();
+			},
+
+			// 关闭物品类型选择器
+			closeItemTypePickerForItem() {
+				this.$refs.itemTypePopup.close();
+				this.currentPickerItemIndex = -1;
+			},
+
+			// 选择物品类型
+			selectItemType(type) {
+				if (this.currentPickerItemIndex === -1) return;
+
+				const item = this.splitCoils[this.currentPickerItemIndex];
+				const currentIndex = this.currentPickerItemIndex;
+
+				// 设置物品类型
+				this.$set(item, 'itemType', type);
+				// 清空之前选择的物品
+				this.$set(item, 'itemId', undefined);
+				this.$set(item, 'productName', '');
+				this.$set(item, 'rawMaterialName', '');
+
+				this.closeItemTypePickerForItem();
+
+				// 根据类型自动弹出对应的选择器
+				if (type === 'product') {
+					this.showProductPickerForItem(currentIndex);
+				} else if (type === 'raw_material') {
+					this.showRawMaterialPickerForItem(currentIndex);
 				}
-			} catch (err) {
-				console.error('加载原材料异常:', err);
-			}
-		},
-		
-		// 过滤库区（在选择器中）
-		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);
-				});
-			}
-		},
-		
-		// 从选择器中选择库区
-		async selectWarehouseFromPicker(warehouse) {
-			if (this.currentPickerItemIndex === -1) return;
-			
-			const item = this.splitCoils[this.currentPickerItemIndex];
-			
-			// 使用 $set 确保响应式更新
-			this.$set(item, 'warehouseId', warehouse.warehouseId);
-			this.$set(item, 'warehouseName', warehouse.warehouseName);
-			
-			this.closeWarehousePickerForItem();
-		},
-		
-		// 显示物品类型选择器
-		showItemTypePickerForItem(index) {
-			this.currentPickerItemIndex = index;
-			this.$refs.itemTypePopup.open();
-		},
-		
-		// 关闭物品类型选择器
-		closeItemTypePickerForItem() {
-			this.$refs.itemTypePopup.close();
-			this.currentPickerItemIndex = -1;
-		},
-		
-		// 选择物品类型
-		selectItemType(type) {
-			if (this.currentPickerItemIndex === -1) return;
-			
-			const item = this.splitCoils[this.currentPickerItemIndex];
-			const currentIndex = this.currentPickerItemIndex;
-			
-			// 设置物品类型
-			this.$set(item, 'itemType', type);
-			// 清空之前选择的物品
-			this.$set(item, 'itemId', undefined);
-			this.$set(item, 'productName', '');
-			this.$set(item, 'rawMaterialName', '');
-			
-			this.closeItemTypePickerForItem();
-			
-			// 根据类型自动弹出对应的选择器
-			if (type === 'product') {
-				this.showProductPickerForItem(currentIndex);
-			} else if (type === 'raw_material') {
-				this.showRawMaterialPickerForItem(currentIndex);
-			}
-		},
-		
-		// 显示BOM弹窗
-		showBomDialog() {
-			this.$refs.bomPopup.open();
-		},
-		
-		// 关闭BOM弹窗
-		closeBomDialog() {
-			this.$refs.bomPopup.close();
-		},
-		
-		// 显示库区选择器（为特定分卷）
-		showWarehousePickerForItem(index) {
-			this.currentPickerItemIndex = index;
-			this.warehouseSearchKeyword = '';
-			this.filteredWarehousesInPicker = [...this.warehouses];
-			this.$refs.warehousePopup.open();
-		},
-		
-		// 关闭库区选择器
-		closeWarehousePickerForItem() {
-			this.$refs.warehousePopup.close();
-			this.currentPickerItemIndex = -1;
-		},
-		
-		// 显示产品选择器（为特定分卷）
-		showProductPickerForItem(index) {
-			this.currentPickerItemIndex = index;
-			this.productSearchKeyword = '';
-			this.filteredProductsInPicker = [...this.products];
-			this.$refs.productPopup.open();
-		},
-		
-		// 关闭产品选择器
-		closeProductPickerForItem() {
-			this.$refs.productPopup.close();
-			this.currentPickerItemIndex = -1;
-		},
-		
-		// 过滤产品（在选择器中）
-		filterProductsInPicker() {
-			const keyword = this.productSearchKeyword.trim().toLowerCase();
-			if (!keyword) {
+			},
+
+			// 显示BOM弹窗
+			showBomDialog() {
+				this.$refs.bomPopup.open();
+			},
+
+			// 关闭BOM弹窗
+			closeBomDialog() {
+				this.$refs.bomPopup.close();
+			},
+
+			// 显示产品选择器（为特定分卷）
+			showProductPickerForItem(index) {
+				this.currentPickerItemIndex = index;
+				this.productSearchKeyword = '';
 				this.filteredProductsInPicker = [...this.products];
-			} else {
-				this.filteredProductsInPicker = this.products.filter(product => {
-					const name = (product.productName || '').toLowerCase();
-					return name.includes(keyword);
+				this.$refs.productPopup.open();
+			},
+
+			// 关闭产品选择器
+			closeProductPickerForItem() {
+				this.$refs.productPopup.close();
+				this.currentPickerItemIndex = -1;
+			},
+
+			// 过滤产品（在选择器中）
+			filterProductsInPicker() {
+				const keyword = this.productSearchKeyword.trim().toLowerCase();
+				if (!keyword) {
+					this.filteredProductsInPicker = [...this.products];
+				} else {
+					this.filteredProductsInPicker = this.products.filter(product => {
+						const name = (product.productName || '').toLowerCase();
+						return name.includes(keyword);
+					});
+				}
+			},
+
+			// 从选择器中选择产品
+			selectProductFromPicker(product) {
+				if (this.currentPickerItemIndex === -1) return;
+
+				const item = this.splitCoils[this.currentPickerItemIndex];
+				item.itemId = product.productId;
+				item.itemType = 'product';
+				item.productName = product.productName; // 保存产品名称用于显示
+				uni.showToast({
+					title: `分卷 ${this.currentPickerItemIndex + 1} 已选择产品：${product.productName}`,
+					icon: 'success'
 				});
-			}
-		},
-		
-		// 从选择器中选择产品
-		selectProductFromPicker(product) {
-			if (this.currentPickerItemIndex === -1) return;
-			
-			const item = this.splitCoils[this.currentPickerItemIndex];
-			item.itemId = product.productId;
-			item.itemType = 'product';
-			item.productName = product.productName; // 保存产品名称用于显示
-			uni.showToast({
-				title: `分卷 ${this.currentPickerItemIndex + 1} 已选择产品：${product.productName}`,
-				icon: 'success'
-			});
-			this.closeProductPickerForItem();
-		},
-		
-		// 显示原材料选择器（为特定分卷）
-		showRawMaterialPickerForItem(index) {
-			this.currentPickerItemIndex = index;
-			this.rawMaterialSearchKeyword = '';
-			this.filteredRawMaterialsInPicker = [...this.rawMaterials];
-			this.$refs.rawMaterialPopup.open();
-		},
-		
-		// 关闭原材料选择器
-		closeRawMaterialPickerForItem() {
-			this.$refs.rawMaterialPopup.close();
-			this.currentPickerItemIndex = -1;
-		},
-		
-		// 过滤原材料（在选择器中）
-		filterRawMaterialsInPicker() {
-			const keyword = this.rawMaterialSearchKeyword.trim().toLowerCase();
-			if (!keyword) {
+				this.closeProductPickerForItem();
+			},
+
+			// 显示原材料选择器（为特定分卷）
+			showRawMaterialPickerForItem(index) {
+				this.currentPickerItemIndex = index;
+				this.rawMaterialSearchKeyword = '';
 				this.filteredRawMaterialsInPicker = [...this.rawMaterials];
-			} else {
-				this.filteredRawMaterialsInPicker = this.rawMaterials.filter(material => {
-					const name = (material.rawMaterialName || '').toLowerCase();
-					return name.includes(keyword);
+				this.$refs.rawMaterialPopup.open();
+			},
+
+			// 关闭原材料选择器
+			closeRawMaterialPickerForItem() {
+				this.$refs.rawMaterialPopup.close();
+				this.currentPickerItemIndex = -1;
+			},
+
+			// 过滤原材料（在选择器中）
+			filterRawMaterialsInPicker() {
+				const keyword = this.rawMaterialSearchKeyword.trim().toLowerCase();
+				if (!keyword) {
+					this.filteredRawMaterialsInPicker = [...this.rawMaterials];
+				} else {
+					this.filteredRawMaterialsInPicker = this.rawMaterials.filter(material => {
+						const name = (material.rawMaterialName || '').toLowerCase();
+						return name.includes(keyword);
+					});
+				}
+			},
+
+			// 从选择器中选择原材料
+			selectRawMaterialFromPicker(material) {
+				if (this.currentPickerItemIndex === -1) return;
+
+				const item = this.splitCoils[this.currentPickerItemIndex];
+				item.itemId = material.rawMaterialId;
+				item.itemType = 'raw_material';
+				item.rawMaterialName = material.rawMaterialName; // 保存原材料名称用于显示
+				uni.showToast({
+					title: `分卷 ${this.currentPickerItemIndex + 1} 已选择原材料：${material.rawMaterialName}`,
+					icon: 'success'
 				});
-			}
-		},
-		
-		// 从选择器中选择原材料
-		selectRawMaterialFromPicker(material) {
-			if (this.currentPickerItemIndex === -1) return;
-			
-			const item = this.splitCoils[this.currentPickerItemIndex];
-			item.itemId = material.rawMaterialId;
-			item.itemType = 'raw_material';
-			item.rawMaterialName = material.rawMaterialName; // 保存原材料名称用于显示
-			uni.showToast({
-				title: `分卷 ${this.currentPickerItemIndex + 1} 已选择原材料：${material.rawMaterialName}`,
-				icon: 'success'
-			});
-			this.closeRawMaterialPickerForItem();
-		},
-		
-		// 过滤库区（为特定分卷）
-		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 => {
+				this.closeRawMaterialPickerForItem();
+			},
+
+			// 过滤库区（为特定分卷）
+			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;
-			});
-		},
-		
-		// 显示库区选择器（为特定分卷）
-		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);
+			},
+
+			// 关闭所有库区搜索列表
+			closeWarehouseList() {
+				this.splitCoils.forEach(item => {
+					item.showWarehouseList = false;
 				});
-			}
-		},
-		
-		// 扫码
-		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和coil_id
-						const qrcodeRecord = qrcodeRes.data;
-						const content = JSON.parse(qrcodeRecord.content);
-						const enterCoilNo = content.enter_coil_no;
-						const currentCoilNo = content.current_coil_no;
-						const coilId = content.coil_id && content.coil_id !== 'null' ? content.coil_id : null;
-						
-						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;
-						const records = traceRes.data.records;
-						
-						// 优先使用coil_id精确匹配
-						if (coilId) {
-							coilData = records.find(record => String(record.coilId) === String(coilId));
-						}
-						
-						// 如果没找到，使用currentCoilNo匹配
-						if (!coilData && currentCoilNo) {
-							coilData = records.find(record => record.currentCoilNo === currentCoilNo);
-						}
-						
-						// 如果还是没找到，取第一条记录
-						if (!coilData && records.length > 0) {
-							coilData = records[0];
-						}
-						
-						if (!coilData) {
-							throw new Error('未找到对应的钢卷数据');
-						}
-						
-						// 5. 检查是否为历史数据
-						if (coilData.dataType === 0) {
-							uni.showModal({
-								title: '历史数据',
-								content: '此为历史记录，不允许进行分卷操作',
-								showCancel: 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);
+					});
+				}
+			},
+
+			// 扫码
+			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和coil_id
+							const qrcodeRecord = qrcodeRes.data;
+							const content = JSON.parse(qrcodeRecord.content);
+							const enterCoilNo = content.enter_coil_no;
+							const currentCoilNo = content.current_coil_no;
+							const coilId = content.coil_id && content.coil_id !== 'null' ? content.coil_id : null;
+
+							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;
+							const records = traceRes.data.records;
+
+							// 优先使用coil_id精确匹配
+							if (coilId) {
+								coilData = records.find(record => String(record.coilId) === String(coilId));
+							}
+
+							// 如果没找到，使用currentCoilNo匹配
+							if (!coilData && currentCoilNo) {
+								coilData = records.find(record => record.currentCoilNo === currentCoilNo);
+							}
+
+							// 如果还是没找到，取第一条记录
+							if (!coilData && records.length > 0) {
+								coilData = records[0];
+							}
+
+							if (!coilData) {
+								throw new Error('未找到对应的钢卷数据');
+							}
+
+							// 5. 检查是否为历史数据
+							if (coilData.dataType === 0) {
+								uni.showModal({
+									title: '历史数据',
+									content: '此为历史记录，不允许进行分卷操作',
+									showCancel: false
+								});
+								return;
+							}
+
+							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
 							});
-							return;
 						}
-						
-						this.coilDetail = coilData;
-						this.form.coilId = coilData.coilId;
-						
-						console.log('钢卷详情：', coilData);
+					},
+					fail: (err) => {
+						console.error('扫码失败：', err);
 						uni.showToast({
-							title: '扫码成功',
+							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,
+						actualWarehouseId: undefined,
+						warehouseName: '',
+						warehouseKeyword: '',
+						filteredWarehouses: this.warehouses,
+						showWarehouseList: false,
+						itemType: '',
+						itemId: undefined,
+						productName: '',
+						rawMaterialName: '',
+						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,
+									actualWarehouseId: undefined,
+									warehouseName: '',
+									warehouseKeyword: '',
+									filteredWarehouses: this.warehouses,
+									showWarehouseList: false,
+									itemType: '',
+									itemId: undefined,
+									productName: '',
+									rawMaterialName: '',
+									grossWeight: '',
+									netWeight: ''
+								},
+								{
+									currentCoilNo: '',
+									team: '',
+									hasMergeSplit: 1,
+									warehouseId: undefined,
+									actualWarehouseId: undefined,
+									warehouseName: '',
+									warehouseKeyword: '',
+									filteredWarehouses: this.warehouses,
+									showWarehouseList: false,
+									itemType: '',
+									itemId: undefined,
+									productName: '',
+									rawMaterialName: '',
+									grossWeight: '',
+									netWeight: ''
+								}
+							];
+						}
+					}
+				});
+			},
+
+			// 提交分卷
+			handleConfirm() {
+				// 历史数据不允许分卷
+				if (this.coilDetail.dataType === 0) {
+					uni.showModal({
+						title: '历史数据',
+						content: '此为历史记录，不允许进行分卷操作',
+						showCancel: false
+					});
+					return;
+				}
+
+				// 验证所有分卷都有钢卷号和班组
+				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: item.itemType || this.coilDetail.itemType, // 优先使用分卷的itemType
+						itemId: item.itemId || this.coilDetail.itemId, // 优先使用分卷的itemId
+						warehouseId: item.warehouseId || this.coilDetail.warehouseId, // 使用分卷的库区或原库区
+						actualWarehouseId: item.actualWarehouseId || this.coilDetail.actualWarehouseId,
+						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'
 						});
-					} catch (err) {
-						console.error('扫码处理失败：', err);
-            uni.showToast({
-							title: err.message || '扫码信息解析失败',
-							icon: 'none',
-							duration: 2000
+						setTimeout(() => {
+							this.handleReset();
+						}, 1500);
+					} else {
+						uni.showToast({
+							title: res.msg || '分卷失败',
+							icon: 'none'
 						});
 					}
-        },
-        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,
-					itemType: '',
-					itemId: undefined,
-					productName: '',
-					rawMaterialName: '',
-					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,
-							itemType: '',
-							itemId: undefined,
-							productName: '',
-							rawMaterialName: '',
-							grossWeight: '',
-							netWeight: ''
-						},
-						{ 
-							currentCoilNo: '', 
-							team: '',
-							hasMergeSplit: 1,
-							warehouseId: undefined,
-							warehouseName: '',
-							warehouseKeyword: '',
-							filteredWarehouses: this.warehouses,
-							showWarehouseList: false,
-							itemType: '',
-							itemId: undefined,
-							productName: '',
-							rawMaterialName: '',
-							grossWeight: '',
-							netWeight: ''
-						}
-					];
-					}
-				}
-			});
-		},
-		
-		// 提交分卷
-    handleConfirm() {
-			// 历史数据不允许分卷
-			if (this.coilDetail.dataType === 0) {
-				uni.showModal({
-					title: '历史数据',
-					content: '此为历史记录，不允许进行分卷操作',
-					showCancel: false
-				});
-				return;
-			}
-			
-			// 验证所有分卷都有钢卷号和班组
-			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: item.itemType || this.coilDetail.itemType, // 优先使用分卷的itemType
-					itemId: item.itemId || this.coilDetail.itemId, // 优先使用分卷的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) {
+				}).catch(err => {
+					console.error('提交失败：', err);
 					uni.showToast({
-						title: '分卷成功',
-						icon: 'success'
-					});
-					setTimeout(() => {
-						this.handleReset();
-					}, 1500);
-				} else {
-					uni.showToast({
-						title: res.msg || '分卷失败',
+						title: '分卷失败，请重试',
 						icon: 'none'
 					});
-				}
-			}).catch(err => {
-				console.error('提交失败：', err);
-				uni.showToast({
-					title: '分卷失败，请重试',
-					icon: 'none'
+				}).finally(() => {
+					this.loading = false;
 				});
-			}).finally(() => {
-				this.loading = false;
-			});
-    }
-  }
-}
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.apart-container {
-	padding-bottom: 30rpx;
-}
+	.apart-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, #ff9500 0%, #ff6b00 100%);
+	/* 扫码区域 */
+	.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;
-			justify-content: center;
-			box-shadow: 0 8rpx 24rpx rgba(255, 149, 0, 0.3);
-			
-			&:active {
-				transform: scale(0.95);
+			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;
 			}
 		}
-		
-		.icon-camera {
-			font-size: 70rpx;
+	}
+
+	/* 卡片样式 */
+	.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);
+	}
+
+	.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;
 		}
-		
-		.scan-tip {
-			font-size: 28rpx;
-			color: #666;
+
+		.title-text {
+			flex: 1;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333;
 		}
 	}
-}
 
-/* 卡片样式 */
-.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);
-}
+	/* 信息网格 */
+	.info-grid {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 20rpx;
 
-.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;
-	}
-}
+		.info-item {
+			flex: 1;
+			min-width: 45%;
+			background: #f8f9fa;
+			padding: 20rpx;
+			border-radius: 12rpx;
 
-/* 信息网格 */
-.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-label {
+				display: block;
+				font-size: 24rpx;
+				color: #999;
+				margin-bottom: 10rpx;
+			}
+
+			.item-value {
+				display: block;
+				font-size: 28rpx;
+				color: #333;
+				font-weight: 500;
+			}
 		}
-		
-		.item-value {
+	}
+
+	/* 表单项 */
+	.form-item {
+		margin-bottom: 30rpx;
+
+		.form-label {
 			display: block;
 			font-size: 28rpx;
-  color: #333;
-  font-weight: 500;
-}
-	}
-}
+			color: #333;
+			margin-bottom: 15rpx;
+			font-weight: 500;
 
-/* 表单项 */
-.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;
+			&::before {
+				content: '*';
+				color: #ff4d4f;
+				margin-right: 6rpx;
+			}
 		}
 	}
-}
 
-/* 分卷数量选择器 */
-.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;
+	/* 分卷数量选择器 */
+	.split-count-selector {
 		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;
-	}
-}
+		gap: 40rpx;
+		padding: 20rpx 0;
 
-/* 分卷列表 */
-.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;
-					}
-				}
-			}
-		}
-	}
-}
-
-/* 操作者信息 */
-.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;
-	}
-}
-
-/* 操作按钮 */
-.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);
-	}
-}
-
-/* 库区选择弹窗 */
-.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 {
+		.count-btn {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 50%;
+			background: linear-gradient(135deg, #ff9500 0%, #ff6b00 100%);
+			color: #fff;
 			font-size: 40rpx;
-			color: #999;
-			width: 60rpx;
-			height: 60rpx;
 			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;
 		}
 	}
-	
-	.popup-search {
-		padding: 20rpx 30rpx;
-		border-bottom: 1rpx solid #f0f0f0;
-		
-		.search-input {
-  width: 100%;
-			height: 80rpx;
-			padding: 0 20rpx;
+
+	/* 分卷列表 */
+	.split-list {
+		margin-top: 20rpx;
+
+		.split-item {
 			background: #f8f9fa;
-			border: 2rpx solid #e8e8e8;
-  border-radius: 10rpx;
-			font-size: 28rpx;
-			color: #333;
-			box-sizing: border-box;
-			
-			&:focus {
-				background: #fff;
-				border-color: #ff9500;
+			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;
+						}
+					}
+				}
 			}
 		}
 	}
-	
-	.popup-body {
-		max-height: 400rpx;
-		
-		.warehouse-item {
+
+	/* 操作者信息 */
+	.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;
+		}
+	}
+
+	/* 操作按钮 */
+	.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);
+		}
+	}
+
+	/* 库区选择弹窗 */
+	.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 #f5f5f5;
-			
-			&:last-child {
-				border-bottom: none;
-			}
-			
-			&:active {
-				background: #fff3e0;
-			}
-			
-			.warehouse-name {
-				flex: 1;
-				font-size: 28rpx;
-				color: #333;
-			}
-			
-			.warehouse-check {
+			border-bottom: 1rpx solid #f0f0f0;
+
+			.popup-title {
 				font-size: 32rpx;
-				color: #ff9500;
-				font-weight: bold;
+				color: #333;
+				font-weight: 600;
 			}
-		}
-		
-		.empty-tip {
-			text-align: center;
-			padding: 60rpx 0;
-			color: #999;
-			font-size: 28rpx;
-		}
-	}
-}
 
-/* 参数按钮 */
-.more-btn {
-	display: flex;
-	align-items: center;
-	gap: 8rpx;
-	padding: 8rpx 16rpx;
-	background: #fff3e0;
-	border-radius: 20rpx;
-	border: 1rpx solid #ff9500;
-	
-	.icon-more {
-		font-size: 24rpx;
-		color: #ff9500;
-	}
-	
-	.more-text {
-		font-size: 24rpx;
-		color: #ff9500;
-	}
-}
-
-/* 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;
-		}
-	}
-	
-	.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 {
+			.popup-close {
+				font-size: 40rpx;
+				color: #999;
 				width: 60rpx;
 				height: 60rpx;
-				background: #ff9500;
-				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;
-					}
+		}
+
+		.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;
 				}
 			}
 		}
-		
-		.empty-tip {
-			text-align: center;
-			padding: 60rpx 0;
-			color: #999;
-			font-size: 28rpx;
+
+		.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;
+			}
 		}
 	}
-}
-</style>
+
+	/* 参数按钮 */
+	.more-btn {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		padding: 8rpx 16rpx;
+		background: #fff3e0;
+		border-radius: 20rpx;
+		border: 1rpx solid #ff9500;
+
+		.icon-more {
+			font-size: 24rpx;
+			color: #ff9500;
+		}
+
+		.more-text {
+			font-size: 24rpx;
+			color: #ff9500;
+		}
+	}
+
+	/* 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;
+			}
+		}
+
+		.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: #ff9500;
+					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
diff --git a/apps/hand-factory/components/panels/code/merge.vue b/apps/hand-factory/components/panels/code/merge.vue
index c1a42f5..8113900 100644
--- a/apps/hand-factory/components/panels/code/merge.vue
+++ b/apps/hand-factory/components/panels/code/merge.vue
@@ -71,18 +71,26 @@
 			
 			<!-- 目标库区 -->
 			<view class="form-item form-item-optional">
-				<text class="form-label-optional">目标库区</text>
+				<text class="form-label-optional">目标库位</text>
 				<view 
 					class="picker-input" 
 					@click="showWarehousePicker()"
 				>
 					<text class="picker-text" :class="{ 'picker-placeholder': !warehouseName }">
-						{{ warehouseName || '请选择目标库区' }}
+						{{ warehouseName || '请选择目标库位' }}
 					</text>
 					<text class="picker-arrow">▼</text>
 				</view>
 			</view>
 			
+			<!-- 实际库区 -->
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">实际库区</text>
+				<klp-warehouse-picker v-model="actualWarehouseId" placeholder="请选择目标库区"
+					ware-type="actual" />
+			</view>
+			
+			
 			<!-- 物品类型选择 -->
 			<view class="form-item form-item-optional">
 				<text class="form-label-optional">物品类型</text>
@@ -299,6 +307,7 @@ export default {
 			mergedCoilNo: '',
 			team: '',
 			warehouseId: undefined,
+			actualWarehouseId: undefined,
 			warehouseName: '',
 			warehouseKeyword: '',
 			warehouses: [],
@@ -686,6 +695,7 @@ export default {
 						this.mergedCoilNo = '';
 						this.team = '';
 						this.warehouseId = undefined;
+						this.actualWarehouseId = undefined;
 						this.warehouseName = '';
 						this.warehouseKeyword = '';
 						this.itemType = '';
@@ -752,6 +762,7 @@ export default {
 				itemType: this.itemType || this.scannedCoils[0].itemType, // 优先使用选择的itemType
 				itemId: this.itemId || this.scannedCoils[0].itemId, // 优先使用选择的itemId
 				warehouseId: this.warehouseId || this.scannedCoils[0].warehouseId, // 使用选择的库区或第一个钢卷的库区
+				actualWarehouseId: this.actualWarehouseId || this.scannedCoils[0].actualWarehouseId
 				grossWeight: this.grossWeight ? Number(this.grossWeight) : null,
 				netWeight: this.netWeight ? Number(this.netWeight) : null,
 				newCoils: this.scannedCoils.map(coil => ({
diff --git a/apps/hand-factory/components/panels/code/typing.vue b/apps/hand-factory/components/panels/code/typing.vue
index 0c350d0..7367517 100644
--- a/apps/hand-factory/components/panels/code/typing.vue
+++ b/apps/hand-factory/components/panels/code/typing.vue
@@ -9,7 +9,7 @@
 				<text class="scan-tip">点击扫描二维码</text>
 			</view>
 		</view>
-		
+
 		<!-- 钢卷基本信息 -->
 		<view class="info-card" v-if="form.coilId">
 			<view class="card-title">
@@ -23,7 +23,7 @@
 					<text class="more-text">参数</text>
 				</view>
 			</view>
-			
+
 			<view class="info-grid">
 				<view class="info-item">
 					<text class="item-label">入场钢卷号</text>
@@ -39,7 +39,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 历史数据提示 -->
 		<view class="warning-card" v-if="form.coilId && coilDetail.dataType === 0">
 			<view class="warning-icon">⚠️</view>
@@ -48,176 +48,106 @@
 				<text class="warning-desc">此为历史记录，仅供查看，不允许进行修改操作</text>
 			</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>
-				<input 
-					v-model="form.currentCoilNo" 
-					placeholder="请输入当前钢卷号" 
-					class="form-input"
-					:disabled="coilDetail.dataType === 0"
-					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
-				/>
+				<input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" class="form-input"
+					:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
 			</view>
-			
+
 			<!-- 班组 -->
 			<view class="form-item">
 				<text class="form-label">班组</text>
-				<input 
-					v-model="form.team" 
-					placeholder="请输入班组名称" 
-					class="form-input"
-					:disabled="coilDetail.dataType === 0"
-					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
-				/>
+				<input v-model="form.team" placeholder="请输入班组名称" class="form-input" :disabled="coilDetail.dataType === 0"
+					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
 			</view>
-			
+
 			<!-- 库区选择 -->
 			<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>
+				<text class="form-label-optional">目标库位</text>
+				<klp-warehouse-picker v-model="form.warehouseId" :disabled="coilDetail.dataType === 0" placeholder="请选择目标库区"
+					@change="handleWarehouseChange" />
 			</view>
 			
+			<view class="form-item form-item-optional">
+				<text class="form-label-optional">真实库区</text>
+				<klp-warehouse-picker v-model="form.actualWarehouseId" :disabled="coilDetail.dataType === 0" placeholder="请选择目标库区"
+					ware-type="actual" />
+			</view>
+
 			<!-- 物品类型选择 -->
 			<view class="form-item form-item-optional">
 				<text class="form-label-optional">物品类型</text>
-				<view 
-					class="picker-input" 
-					@click="coilDetail.dataType !== 0 && showItemTypePicker()"
-					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
-				>
+				<view class="picker-input" @click="coilDetail.dataType !== 0 && showItemTypePicker()"
+					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }">
 					<text class="picker-text" :class="{ 'picker-placeholder': !form.itemType }">
 						{{ form.itemType === 'product' ? '成品' : form.itemType === 'raw_material' ? '原料' : '请选择物品类型' }}
 					</text>
 					<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
 				</view>
 			</view>
-			
+
 			<!-- 产品选择（仅当选择了成品类型时显示） -->
 			<view class="form-item form-item-optional" v-if="form.itemType === 'product'">
 				<text class="form-label-optional">选择产品</text>
-				<view 
-					class="picker-input" 
-					@click="coilDetail.dataType !== 0 && showProductPicker()"
-					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
-				>
+				<view class="picker-input" @click="coilDetail.dataType !== 0 && showProductPicker()"
+					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }">
 					<text class="picker-text" :class="{ 'picker-placeholder': !selectedProductName }">
 						{{ selectedProductName || '请选择产品' }}
 					</text>
 					<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
 				</view>
 			</view>
-			
+
 			<!-- 原材料选择（仅当选择了原料类型时显示） -->
 			<view class="form-item form-item-optional" v-if="form.itemType === 'raw_material'">
 				<text class="form-label-optional">选择原材料</text>
-				<view 
-					class="picker-input" 
-					@click="coilDetail.dataType !== 0 && showRawMaterialPicker()"
-					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
-				>
+				<view class="picker-input" @click="coilDetail.dataType !== 0 && showRawMaterialPicker()"
+					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }">
 					<text class="picker-text" :class="{ 'picker-placeholder': !selectedRawMaterialName }">
 						{{ selectedRawMaterialName || '请选择原材料' }}
 					</text>
 					<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
 				</view>
 			</view>
-			
+
 			<!-- 毛重 -->
 			<view class="form-item form-item-optional">
 				<text class="form-label-optional">毛重 (吨)</text>
-				<input 
-					v-model="form.grossWeight" 
-					type="digit" 
-					placeholder="请输入毛重（选填）" 
-					class="form-input"
-					:disabled="coilDetail.dataType === 0"
-					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
-				/>
+				<input v-model="form.grossWeight" type="digit" placeholder="请输入毛重（选填）" class="form-input"
+					:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
 			</view>
-			
+
 			<!-- 净重 -->
 			<view class="form-item form-item-optional">
 				<text class="form-label-optional">净重 (吨)</text>
-				<input 
-					v-model="form.netWeight" 
-					type="digit" 
-					placeholder="请输入净重（选填）" 
-					class="form-input"
-					:disabled="coilDetail.dataType === 0"
-					:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
-				/>
+				<input v-model="form.netWeight" type="digit" placeholder="请输入净重（选填）" class="form-input"
+					:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
 			</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 
-					v-if="coilDetail.dataType === 1"
-					class="btn btn-primary" 
-					@click="handleConfirm" 
-					:disabled="loading"
-				>
+				<button class="btn btn-secondary" @click="handleReScan">重新扫码</button>
+				<button v-if="coilDetail.dataType === 1" 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="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>
-		
+
 		<!-- 产品选择弹窗 -->
 		<uni-popup ref="productPopup" type="bottom">
 			<view class="warehouse-popup">
@@ -226,20 +156,12 @@
 					<text class="popup-close" @click="closeProductPicker">✕</text>
 				</view>
 				<view class="popup-search">
-					<input 
-						v-model="productSearchKeyword" 
-						@input="filterProductsInPicker"
-						placeholder="搜索产品名称" 
-						class="search-input"
-					/>
+					<input v-model="productSearchKeyword" @input="filterProductsInPicker" placeholder="搜索产品名称"
+						class="search-input" />
 				</view>
 				<scroll-view scroll-y class="popup-body">
-					<view 
-						class="warehouse-item" 
-						v-for="product in filteredProductsInPicker" 
-						:key="product.productId"
-						@click="selectProductFromPicker(product)"
-					>
+					<view class="warehouse-item" v-for="product in filteredProductsInPicker" :key="product.productId"
+						@click="selectProductFromPicker(product)">
 						<text class="warehouse-name">{{ product.productName }}</text>
 						<text class="warehouse-check" v-if="form.itemId === product.productId">✓</text>
 					</view>
@@ -249,7 +171,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- 原材料选择弹窗 -->
 		<uni-popup ref="rawMaterialPopup" type="bottom">
 			<view class="warehouse-popup">
@@ -258,20 +180,12 @@
 					<text class="popup-close" @click="closeRawMaterialPicker">✕</text>
 				</view>
 				<view class="popup-search">
-					<input 
-						v-model="rawMaterialSearchKeyword" 
-						@input="filterRawMaterialsInPicker"
-						placeholder="搜索原材料名称" 
-						class="search-input"
-					/>
+					<input v-model="rawMaterialSearchKeyword" @input="filterRawMaterialsInPicker" placeholder="搜索原材料名称"
+						class="search-input" />
 				</view>
 				<scroll-view scroll-y class="popup-body">
-					<view 
-						class="warehouse-item" 
-						v-for="material in filteredRawMaterialsInPicker" 
-						:key="material.rawMaterialId"
-						@click="selectRawMaterialFromPicker(material)"
-					>
+					<view class="warehouse-item" v-for="material in filteredRawMaterialsInPicker" :key="material.rawMaterialId"
+						@click="selectRawMaterialFromPicker(material)">
 						<text class="warehouse-name">{{ material.rawMaterialName }}</text>
 						<text class="warehouse-check" v-if="form.itemId === material.rawMaterialId">✓</text>
 					</view>
@@ -281,7 +195,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- 物品类型选择弹窗 -->
 		<uni-popup ref="itemTypePopup" type="bottom">
 			<view class="warehouse-popup">
@@ -301,7 +215,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
-		
+
 		<!-- BOM弹窗 -->
 		<uni-popup ref="bomPopup" type="bottom">
 			<view class="bom-popup">
@@ -333,1064 +247,1031 @@
 </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'
-import { getRawMaterial, listRawMaterial } from '@/api/wms/rawMaterial.js'
-import { listProduct } from '@/api/wms/product.js'
-	
-	export default { 
+	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,
+		listRawMaterial
+	} from '@/api/wms/rawMaterial.js'
+	import {
+		listProduct
+	} from '@/api/wms/product.js'
+
+	export default {
 		data() {
 			return {
 				form: {
 					coilId: undefined,
-				itemType: '',
+					itemType: '',
 					itemId: undefined,
-				team: '',
-				currentCoilNo: '',
+					team: '',
+					currentCoilNo: '',
 					warehouseId: undefined,
-				warehouseName: '',
-				grossWeight: '',
-				netWeight: ''
+					actualWarehouseId: undefined,
+					warehouseName: '',
+					grossWeight: '',
+					netWeight: '',
+				},
+				coilDetail: {},
+				materialDetail: null,
+				bomItemList: [],
+				warehouses: [],
+				filteredWarehouses: [],
+				warehouseKeyword: '',
+				showWarehouseList: false,
+				currentWarehouseName: '',
+				warehouseSearchKeyword: '',
+				filteredWarehousesInPicker: [],
+				products: [], // 产品列表
+				productSearchKeyword: '',
+				filteredProductsInPicker: [],
+				selectedProductName: '', // 已选择的产品名称
+				rawMaterials: [], // 原材料列表
+				rawMaterialSearchKeyword: '',
+				filteredRawMaterialsInPicker: [],
+				selectedRawMaterialName: '', // 已选择的原材料名称
+				loading: false,
+				qrcodeStatus: 1 // 二维码状态：0=历史码，1=当前有效码
+			}
+		},
+
+		computed: {
+			// 获取当前操作者昵称
+			operatorName() {
+				return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+			}
+		},
+
+		onLoad() {
+			this.loadProducts();
+			this.loadRawMaterials();
+		},
+
+		mounted() {
+			this.loadProducts();
+			this.loadRawMaterials();
+		},
+
+		methods: {
+			// 加载产品列表
+			async loadProducts() {
+				console.log('开始加载产品列表...');
+				try {
+					const res = await listProduct({
+						pageNum: 1,
+						pageSize: 1000
+					});
+					console.log("产品返回值", res);
+					if (res.code === 200) {
+						this.products = res.rows || res.data || [];
+						this.filteredProductsInPicker = this.products;
+						console.log('产品加载成功，数量:', this.products.length);
+					} else {
+						console.error('产品加载失败:', res.msg);
+					}
+				} catch (err) {
+					console.error('加载产品异常:', err);
+				}
 			},
-			coilDetail: {},
-			materialDetail: null,
-			bomItemList: [],
-			warehouses: [],
-			filteredWarehouses: [],
-			warehouseKeyword: '',
-			showWarehouseList: false,
-			currentWarehouseName: '',
-			warehouseSearchKeyword: '',
-			filteredWarehousesInPicker: [],
-			products: [], // 产品列表
-			productSearchKeyword: '',
-			filteredProductsInPicker: [],
-			selectedProductName: '', // 已选择的产品名称
-			rawMaterials: [], // 原材料列表
-			rawMaterialSearchKeyword: '',
-			filteredRawMaterialsInPicker: [],
-			selectedRawMaterialName: '', // 已选择的原材料名称
-			loading: false,
-			qrcodeStatus: 1 // 二维码状态：0=历史码，1=当前有效码
-		}
-	},
-	
-	computed: {
-		// 获取当前操作者昵称
-		operatorName() {
-			return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
-		}
-	},
-	
-	onLoad() {
-		this.loadWarehouses();
-		this.loadProducts();
-		this.loadRawMaterials();
-	},
-	
-	mounted() {
-		this.loadWarehouses();
-		this.loadProducts();
-		this.loadRawMaterials();
-	},
-	
-	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);
+
+			// 加载原材料列表
+			async loadRawMaterials() {
+				console.log('开始加载原材料列表...');
+				try {
+					const res = await listRawMaterial({
+						pageNum: 1,
+						pageSize: 1000
+					});
+					console.log("原材料返回值", res);
+					if (res.code === 200) {
+						this.rawMaterials = res.rows || res.data || [];
+						this.filteredRawMaterialsInPicker = this.rawMaterials;
+						console.log('原材料加载成功，数量:', this.rawMaterials.length);
+					} else {
+						console.error('原材料加载失败:', res.msg);
+					}
+				} catch (err) {
+					console.error('加载原材料异常:', err);
 				}
-			} catch (err) {
-				console.error('加载库区异常:', err);
-			}
-		},
-		
-		// 加载产品列表
-		async loadProducts() {
-			console.log('开始加载产品列表...');
-			try {
-				const res = await listProduct({ pageNum: 1, pageSize: 1000 });
-				console.log("产品返回值", res);
-				if (res.code === 200) {
-					this.products = res.rows || res.data || [];
-					this.filteredProductsInPicker = this.products;
-					console.log('产品加载成功，数量:', this.products.length);
-				} else {
-					console.error('产品加载失败:', res.msg);
-				}
-			} catch (err) {
-				console.error('加载产品异常:', err);
-			}
-		},
-		
-		// 加载原材料列表
-		async loadRawMaterials() {
-			console.log('开始加载原材料列表...');
-			try {
-				const res = await listRawMaterial({ pageNum: 1, pageSize: 1000 });
-				console.log("原材料返回值", res);
-				if (res.code === 200) {
-					this.rawMaterials = res.rows || res.data || [];
-					this.filteredRawMaterialsInPicker = this.rawMaterials;
-					console.log('原材料加载成功，数量:', this.rawMaterials.length);
-				} else {
-					console.error('原材料加载失败:', res.msg);
-				}
-			} catch (err) {
-				console.error('加载原材料异常:', err);
-			}
-		},
-		
-		// 显示产品选择器
-		showProductPicker() {
-			this.productSearchKeyword = '';
-			this.filteredProductsInPicker = [...this.products];
-			this.$refs.productPopup.open();
-		},
-		
-		// 关闭产品选择器
-		closeProductPicker() {
-			this.$refs.productPopup.close();
-		},
-		
-		// 过滤产品（在选择器中）
-		filterProductsInPicker() {
-			console.log('过滤产品，关键词:', this.productSearchKeyword);
-			const keyword = this.productSearchKeyword.trim().toLowerCase();
-			if (!keyword) {
+			},
+
+			// 显示产品选择器
+			showProductPicker() {
+				this.productSearchKeyword = '';
 				this.filteredProductsInPicker = [...this.products];
-			} else {
-				this.filteredProductsInPicker = this.products.filter(product => {
-					const name = (product.productName || '').toLowerCase();
-					return name.includes(keyword);
+				this.$refs.productPopup.open();
+			},
+
+			// 关闭产品选择器
+			closeProductPicker() {
+				this.$refs.productPopup.close();
+			},
+
+			// 过滤产品（在选择器中）
+			filterProductsInPicker() {
+				console.log('过滤产品，关键词:', this.productSearchKeyword);
+				const keyword = this.productSearchKeyword.trim().toLowerCase();
+				if (!keyword) {
+					this.filteredProductsInPicker = [...this.products];
+				} else {
+					this.filteredProductsInPicker = this.products.filter(product => {
+						const name = (product.productName || '').toLowerCase();
+						return name.includes(keyword);
+					});
+				}
+			},
+
+			// 从选择器中选择产品
+			selectProductFromPicker(product) {
+				this.form.itemId = product.productId;
+				this.form.itemType = 'product';
+				this.selectedProductName = product.productName;
+				uni.showToast({
+					title: `已选择产品：${product.productName}`,
+					icon: 'success'
 				});
-			}
-		},
-		
-		// 从选择器中选择产品
-		selectProductFromPicker(product) {
-			this.form.itemId = product.productId;
-			this.form.itemType = 'product';
-			this.selectedProductName = product.productName;
-			uni.showToast({
-				title: `已选择产品：${product.productName}`,
-				icon: 'success'
-			});
-			this.closeProductPicker();
-		},
-		
-		// 显示原材料选择器
-		showRawMaterialPicker() {
-			this.rawMaterialSearchKeyword = '';
-			this.filteredRawMaterialsInPicker = [...this.rawMaterials];
-			this.$refs.rawMaterialPopup.open();
-		},
-		
-		// 关闭原材料选择器
-		closeRawMaterialPicker() {
-			this.$refs.rawMaterialPopup.close();
-		},
-		
-		// 过滤原材料（在选择器中）
-		filterRawMaterialsInPicker() {
-			console.log('过滤原材料，关键词:', this.rawMaterialSearchKeyword);
-			const keyword = this.rawMaterialSearchKeyword.trim().toLowerCase();
-			if (!keyword) {
+				this.closeProductPicker();
+			},
+
+			// 显示原材料选择器
+			showRawMaterialPicker() {
+				this.rawMaterialSearchKeyword = '';
 				this.filteredRawMaterialsInPicker = [...this.rawMaterials];
-			} else {
-				this.filteredRawMaterialsInPicker = this.rawMaterials.filter(material => {
-					const name = (material.rawMaterialName || '').toLowerCase();
-					return name.includes(keyword);
+				this.$refs.rawMaterialPopup.open();
+			},
+
+			// 关闭原材料选择器
+			closeRawMaterialPicker() {
+				this.$refs.rawMaterialPopup.close();
+			},
+
+			// 过滤原材料（在选择器中）
+			filterRawMaterialsInPicker() {
+				console.log('过滤原材料，关键词:', this.rawMaterialSearchKeyword);
+				const keyword = this.rawMaterialSearchKeyword.trim().toLowerCase();
+				if (!keyword) {
+					this.filteredRawMaterialsInPicker = [...this.rawMaterials];
+				} else {
+					this.filteredRawMaterialsInPicker = this.rawMaterials.filter(material => {
+						const name = (material.rawMaterialName || '').toLowerCase();
+						return name.includes(keyword);
+					});
+				}
+			},
+
+			// 从选择器中选择原材料
+			selectRawMaterialFromPicker(material) {
+				this.form.itemId = material.rawMaterialId;
+				this.form.itemType = 'raw_material';
+				this.selectedRawMaterialName = material.rawMaterialName;
+				uni.showToast({
+					title: `已选择原材料：${material.rawMaterialName}`,
+					icon: 'success'
 				});
-			}
-		},
-		
-		// 从选择器中选择原材料
-		selectRawMaterialFromPicker(material) {
-			this.form.itemId = material.rawMaterialId;
-			this.form.itemType = 'raw_material';
-			this.selectedRawMaterialName = material.rawMaterialName;
-			uni.showToast({
-				title: `已选择原材料：${material.rawMaterialName}`,
-				icon: 'success'
-			});
-			this.closeRawMaterialPicker();
-		},
-		
-		// 过滤库区
-		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);
-				});
-			}
-		},
-		
-		// 从选择器中选择库区
-		async selectWarehouseFromPicker(warehouse) {
-			this.form.warehouseId = warehouse.warehouseId;
-			this.form.warehouseName = warehouse.warehouseName;
-			this.currentWarehouseName = warehouse.warehouseName;
-			this.closeWarehousePicker();
-		},
-		
-		// 显示物品类型选择器
-		showItemTypePicker() {
-			this.$refs.itemTypePopup.open();
-		},
-		
-		// 关闭物品类型选择器
-		closeItemTypePicker() {
-			this.$refs.itemTypePopup.close();
-		},
-		
-		// 选择物品类型
-		selectItemType(type) {
-			// 设置物品类型
-			this.form.itemType = type;
-			// 清空之前选择的物品
-			this.form.itemId = undefined;
-			this.selectedProductName = '';
-			this.selectedRawMaterialName = '';
-			
-			this.closeItemTypePicker();
-			
-			// 根据类型自动弹出对应的选择器
-			if (type === 'product') {
-				this.showProductPicker();
-			} else if (type === 'raw_material') {
-				this.showRawMaterialPicker();
-			}
-		},
-		
-		// 扫码
-		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和coil_id
-						const qrcodeRecord = qrcodeRes.data;
-						const content = JSON.parse(qrcodeRecord.content);
-						const enterCoilNo = content.enter_coil_no;
-						const currentCoilNo = content.current_coil_no;
-						const coilId = content.coil_id && content.coil_id !== 'null' ? content.coil_id : null;
-						
-						// 保存二维码状态（0=历史码，1=当前有效码）
-						this.qrcodeStatus = qrcodeRecord.status || 1;
-						
-						if (!enterCoilNo) {
-							throw new Error('二维码中未包含有效的入场钢卷号');
-						}
-						
-						// 3. 如果是历史码，提示用户
-						if (this.qrcodeStatus === 0) {
-							uni.showToast({ 
-								title: '历史二维码，仅供查看', 
+				this.closeRawMaterialPicker();
+			},
+
+			// 处理库区选择变化（可选，如需获取完整库区信息）
+			handleWarehouseChange(warehouse) {
+				console.log('选中的库区信息:', warehouse)
+				// 可在这里更新库区名称等信息
+				this.form.warehouseName = warehouse.warehouseName
+				this.currentWarehouseName = warehouse.warehouseName
+			},
+
+			// 显示物品类型选择器
+			showItemTypePicker() {
+				this.$refs.itemTypePopup.open();
+			},
+
+			// 关闭物品类型选择器
+			closeItemTypePicker() {
+				this.$refs.itemTypePopup.close();
+			},
+
+			// 选择物品类型
+			selectItemType(type) {
+				// 设置物品类型
+				this.form.itemType = type;
+				// 清空之前选择的物品
+				this.form.itemId = undefined;
+				this.selectedProductName = '';
+				this.selectedRawMaterialName = '';
+
+				this.closeItemTypePicker();
+
+				// 根据类型自动弹出对应的选择器
+				if (type === 'product') {
+					this.showProductPicker();
+				} else if (type === 'raw_material') {
+					this.showRawMaterialPicker();
+				}
+			},
+
+			// 扫码
+			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和coil_id
+							const qrcodeRecord = qrcodeRes.data;
+							const content = JSON.parse(qrcodeRecord.content);
+							const enterCoilNo = content.enter_coil_no;
+							const currentCoilNo = content.current_coil_no;
+							const coilId = content.coil_id && content.coil_id !== 'null' ? content.coil_id : null;
+
+							// 保存二维码状态（0=历史码，1=当前有效码）
+							this.qrcodeStatus = qrcodeRecord.status || 1;
+
+							if (!enterCoilNo) {
+								throw new Error('二维码中未包含有效的入场钢卷号');
+							}
+
+							// 3. 如果是历史码，提示用户
+							if (this.qrcodeStatus === 0) {
+								uni.showToast({
+									title: '历史二维码，仅供查看',
+									icon: 'none',
+									duration: 2000
+								});
+							}
+
+							// 4. 通过入场钢卷号查询钢卷追溯信息
+							const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
+							if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records
+								.length === 0) {
+								throw new Error('未找到钢卷信息');
+							}
+
+							// 5. 根据二维码内容匹配对应的钢卷数据
+							let coilData = null;
+							const records = traceRes.data.records;
+
+							// 优先使用coil_id精确匹配
+							if (coilId) {
+								coilData = records.find(record => String(record.coilId) === String(coilId));
+							}
+
+							// 如果没找到，使用currentCoilNo匹配
+							if (!coilData && currentCoilNo) {
+								coilData = records.find(record => record.currentCoilNo === currentCoilNo);
+							}
+
+							// 如果还是没找到，取第一条记录
+							if (!coilData && records.length > 0) {
+								coilData = records[0];
+							}
+
+							if (!coilData) {
+								throw new Error('未找到对应的钢卷数据');
+							}
+
+							// 保存钢卷详情
+							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.actualWarehouseId = coilData.actualWarehouseId;
+							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: 'success'
+							});
+						} catch (err) {
+							console.error('扫码处理失败：', err);
+							uni.showToast({
+								title: err.message || '扫码信息解析失败',
 								icon: 'none',
 								duration: 2000
 							});
 						}
-						
-						// 4. 通过入场钢卷号查询钢卷追溯信息
-						const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
-						if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records.length === 0) {
-							throw new Error('未找到钢卷信息');
-						}
-						
-						// 5. 根据二维码内容匹配对应的钢卷数据
-						let coilData = null;
-						const records = traceRes.data.records;
-						
-						// 优先使用coil_id精确匹配
-						if (coilId) {
-							coilData = records.find(record => String(record.coilId) === String(coilId));
-						}
-						
-						// 如果没找到，使用currentCoilNo匹配
-						if (!coilData && currentCoilNo) {
-							coilData = records.find(record => record.currentCoilNo === currentCoilNo);
-						}
-						
-						// 如果还是没找到，取第一条记录
-						if (!coilData && records.length > 0) {
-							coilData = records[0];
-						}
-						
-						if (!coilData) {
-							throw new Error('未找到对应的钢卷数据');
-						}
-						
-						// 保存钢卷详情
-						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);
+					},
+					fail: (err) => {
+						console.error('扫码失败：', err);
 						uni.showToast({
-							title: '扫码成功',
-							icon: 'success'
-						});
-					} catch (err) {
-						console.error('扫码处理失败：', err);
-						uni.showToast({
-							title: err.message || '扫码信息解析失败',
-							icon: 'none',
-							duration: 2000
+							title: '扫码失败，请重试',
+							icon: 'none'
 						});
 					}
-				},
-				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.selectedProductName = '';
-						this.filteredWarehouses = this.warehouses;
-						this.qrcodeStatus = 1; // 重置二维码状态
-					}
-				}
-			});
-		},
-		
-		// 提交
-			handleConfirm() {
-			// 历史数据不允许修改
-			if (this.coilDetail.dataType === 0) {
-				uni.showToast({ title: '历史数据不允许修改', icon: 'none' });
-				return;
-			}
-			
-			// 验证必填项
-			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;
-			});
+			},
+
+			// 显示BOM弹窗
+			showBomDialog() {
+				this.$refs.bomPopup.open();
+			},
+
+			// 关闭BOM弹窗
+			closeBomDialog() {
+				this.$refs.bomPopup.close();
+			},
+
+			// 关闭库区搜索列表
+			closeWarehouseList() {
+				this.showWarehouseList = false;
+			},
+			
+			handleReScan() {
+				uni.showModal({
+					title: '确认重新扫码',
+					content: '是否要清空当前数据并重新扫码？',
+					success: (res) => {
+						this.handleReset()
+					}
+				});
+			},
+
+			// 重新扫码
+			handleReset() {
+				if (res.confirm) {
+					this.form = {
+						coilId: undefined,
+						itemType: '',
+						itemId: undefined,
+						team: '',
+						currentCoilNo: '',
+						warehouseId: undefined,
+						actualWarehouseId: undefined,
+						warehouseName: '',
+						grossWeight: '',
+						netWeight: ''
+					};
+					this.coilDetail = {};
+					this.materialDetail = null;
+					this.bomItemList = [];
+					this.warehouseKeyword = '';
+					this.currentWarehouseName = '';
+					this.selectedProductName = '';
+					this.filteredWarehouses = this.warehouses;
+					this.qrcodeStatus = 1; // 重置二维码状态
+				}
+			},
+
+			// 提交
+			handleConfirm() {
+				// 历史数据不允许修改
+				if (this.coilDetail.dataType === 0) {
+					uni.showToast({
+						title: '历史数据不允许修改',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 验证必填项
+				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,
+					actualWarehouseId: this.form.actualWarehouseId,
+					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);
+						uni.navigateTo({
+							url: '/pages/scansuccess/scansuccess'
+						})
+					} 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;
-}
+	.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%);
+	/* 扫码区域 */
+	.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;
-			justify-content: center;
-			box-shadow: 0 8rpx 24rpx rgba(0, 122, 255, 0.3);
-			
-			&:active {
-				transform: scale(0.95);
+			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;
 			}
 		}
-		
-		.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);
-}
+	/* 卡片样式 */
+	.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 {
+	/* 警告卡片 */
+	.warning-card {
+		background: #fff2f0;
+		border: 2rpx solid #ffccc7;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 20rpx;
 		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;
+		gap: 20rpx;
+
+		.warning-icon {
+			font-size: 48rpx;
+			flex-shrink: 0;
 		}
-		
-		.more-text {
-			font-size: 24rpx;
-			color: #007aff;
+
+		.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;
+			}
 		}
 	}
-}
 
-/* 信息网格 */
-.info-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 20rpx;
-	
-	.info-item {
-		flex: 1;
-		min-width: 45%;
-		background: #f8f9fa;
-		padding: 20rpx;
-		border-radius: 12rpx;
-		
-		&.full-width {
-			flex: 0 0 100%;
-		}
-		
-		.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 {
+	.card-title {
 		display: flex;
+		align-items: center;
 		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx 0;
-		border-bottom: 1rpx solid #f5f5f5;
-		
-		&:last-child {
-			border-bottom: none;
+		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;
 		}
-		
-		.detail-label {
-			font-size: 28rpx;
-			color: #666;
+
+		.title-text {
+			flex: 1;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333;
 		}
-		
-		.detail-value {
+
+		.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;
+
+			&.full-width {
+				flex: 0 0 100%;
+			}
+
+			.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-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-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;
+			}
 		}
 	}
-	
-	.form-label-optional {
-		display: block;
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 15rpx;
-		font-weight: 500;
-	}
-	
-	.form-input {
+
+	/* 选择器输入框 */
+	.picker-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;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 		transition: all 0.3s;
-		
-		&:focus {
+
+		&:active {
 			background: #fff;
 			border-color: #007aff;
 		}
-		
-		&.form-input-disabled {
+
+		&.picker-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;
+		.picker-text {
+			flex: 1;
 			font-size: 28rpx;
 			color: #333;
-			box-sizing: border-box;
-			
-			&:focus {
-				background: #fff;
-				border-color: #007aff;
+
+			&.picker-placeholder {
+				color: #999;
 			}
 		}
+
+		.picker-arrow {
+			font-size: 24rpx;
+			color: #999;
+			margin-left: 10rpx;
+		}
 	}
-	
-	.popup-body {
-		max-height: 400rpx;
-		
-		.warehouse-item {
+
+	/* 库区选择弹窗 */
+	.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 #f5f5f5;
-			
-			&:last-child {
-				border-bottom: none;
-			}
-			
-			&:active {
-				background: #f0f7ff;
-			}
-			
-			.warehouse-name {
-				flex: 1;
-				font-size: 28rpx;
+			border-bottom: 1rpx solid #f0f0f0;
+
+			.popup-title {
+				font-size: 32rpx;
 				color: #333;
+				font-weight: 600;
 			}
-			
-			.warehouse-check {
-		font-size: 32rpx;
-				color: #007aff;
-				font-weight: bold;
-			}
-		}
-		
-		.empty-tip {
-			text-align: center;
-			padding: 60rpx 0;
-			color: #999;
-			font-size: 28rpx;
-		}
-	}
-}
 
-/* 操作者信息 */
-.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: #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;
-		}
-	}
-	
-	.btn-secondary {
-		background: #f5f5f5;
-		color: #666;
-	}
-	
-	.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;
-		}
-	}
-	
-	.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 {
+			.popup-close {
+				font-size: 40rpx;
+				color: #999;
 				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;
-					}
+		}
+
+		.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;
 				}
 			}
 		}
-		
-		.empty-tip {
-			text-align: center;
-			padding: 60rpx 0;
-			color: #999;
-			font-size: 28rpx;
+
+		.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;
+			}
 		}
 	}
+
+	/* 操作者信息 */
+	.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: #007aff;
+			font-weight: 500;
+		}
 	}
-</style>
+
+	/* 操作按钮 */
+	.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, #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;
+			}
+		}
+
+		.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
diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index b5f8e87..cc41aeb 100644
--- a/apps/hand-factory/config.js
+++ b/apps/hand-factory/config.js
@@ -1,14 +1,14 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://192.168.31.116:8080',
-	// baseUrl: 'http://140.143.206.120:8080',
+  // baseUrl: 'http://192.168.31.116:8080',
+	baseUrl: 'http://140.143.206.120:8080',
   // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {
     // 应用名称
     name: "ruoyi-app",
     // 应用版本
-    version: "1.2.0",
+    version: "1.3.5",
     // 应用logo
     logo: "/static/logo.jpg",
     // 官方网站
diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json
index e2dbaee..c40791d 100644
--- a/apps/hand-factory/manifest.json
+++ b/apps/hand-factory/manifest.json
@@ -2,7 +2,7 @@
     "name" : "科伦普",
     "appid" : "__UNI__E781B49",
     "description" : "",
-    "versionName" : "3.4",
+    "versionName" : "3.5",
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
diff --git a/apps/hand-factory/pages.json b/apps/hand-factory/pages.json
index 3de6508..de46b11 100644
--- a/apps/hand-factory/pages.json
+++ b/apps/hand-factory/pages.json
@@ -48,6 +48,13 @@
 			"navigationBarTitleText" : "产线监控",
 			"navigationStyle": "custom"
 		}
+	},
+	{
+		"path" : "pages/scansuccess/scansuccess",
+		"style" : 
+		{
+			"navigationBarTitleText" : "扫码结果"
+		}
 	}
 	// {
 	//   "path": "pages/register",
diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue
index 205ff62..d9a6586 100644
--- a/apps/hand-factory/pages/easycode/easycode.vue
+++ b/apps/hand-factory/pages/easycode/easycode.vue
@@ -137,17 +137,20 @@
 
 							uni.hideLoading();
 							console.log('=== 扫码流程完成 ===');
-							uni.showToast({
-								title: '创建成功',
-								icon: 'success',
-								duration: 2000
-							});
+							uni.navigateTo({
+								url: '/pages/scansuccess/scansuccess'
+							})
+							// uni.showToast({
+							// 	title: '创建成功',
+							// 	icon: 'success',
+							// 	duration: 2000
+							// });
 
-							// 延迟后返回或跳转
-							setTimeout(() => {
-								// 可以跳转到待操作列表或返回上一页
-								uni.navigateBack();
-							}, 2000);
+							// // 延迟后返回或跳转
+							// setTimeout(() => {
+							// 	// 可以跳转到待操作列表或返回上一页
+							// 	uni.navigateBack();
+							// }, 2000);
 
 						} catch (err) {
 							console.error('=== 扫码处理失败 ===');
diff --git a/apps/hand-factory/pages/index.vue b/apps/hand-factory/pages/index.vue
index 9ae633c..207e16a 100644
--- a/apps/hand-factory/pages/index.vue
+++ b/apps/hand-factory/pages/index.vue
@@ -1,93 +1,139 @@
 <template>
-	<!-- <view class="production-page">
-		
-		<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>
-			<Zinc2 v-else-if="active == 3"></Zinc2>
-			<Zinc3 v-else-if="active == 4"></Zinc3>
-		</view>
-	</view> -->
+	<!-- 模板内容保持不变（注释部分可根据需求保留） -->
 </template>
 
 <script>
-// 根据不同的全责跳转到不同的页面
-// 如果是工人跳转到扫码页面
-// 如果是管理员跳转到产线
 export default {
-	created() {
+	data() {
+		return {
+			hasJumped: false // 防止重复跳转的标记
+		}
+	},
+	onShow() {
+		// 已跳转过则不再执行逻辑
+		if (this.hasJumped) return;
+
+		// 显示加载状态，提升用户感知
+		uni.showLoading({
+			title: '验证身份中...',
+			mask: true // 防止用户重复操作
+		});
+
 		// 检查用户角色
-		this.$store.dispatch('GetInfo').then(res => {
-			const roles = res.data.roles;
-			
-			if (roles.includes('admin')) {
-				// 管理员角色，跳转到产线页面
-				uni.switchTab({
-					url: '/pages/line/line'
-				});
-			} else if (roles.includes('worker')) {
-				// 工人角色，跳转到扫码页面
-				uni.navigateTo({
-					url: '/pages/easycode/easycode'
-				});
-			}
-			//  else {
-			// 	// 其他角色，跳转到扫码页面
-			// 	uni.navigateTo({
-			// 		url: '/pages/easycode/easycode'
+		this.$store.dispatch('GetInfo')
+			.then(res => {
+				uni.hideLoading(); // 关闭加载提示
+				
+				console.log('获取身份信息内容', res.data, )
+				// 验证返回数据格式
+				if (!res || !res.data || !Array.isArray(res.data.roles)) {
+					throw new Error('用户角色信息格式错误');
+				}
+				
+				console.log('用户角色信息', res.data.roles)
+
+				const roles = res.data.roles;
+				
+				if (roles.includes('admin')) {
+					// 管理员角色跳转
+					uni.switchTab({
+						url: '/pages/line/line',
+						success: () => {
+							this.hasJumped = true; // 标记已跳转
+						},
+						fail: (err) => {
+							console.error('管理员页面跳转失败:', err);
+							uni.showToast({
+								title: '跳转产线页面失败',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					});
+				} else if (roles.includes('worker')) {
+					// 工人角色跳转
+					uni.navigateTo({
+						url: '/pages/easycode/easycode',
+						success: () => {
+							this.hasJumped = true; // 标记已跳转
+						},
+						fail: (err) => {
+							console.error('工人页面跳转失败:', err);
+							uni.showToast({
+								title: '跳转扫码页面失败',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					});
+				} else {
+					// 处理未定义角色（默认角色）
+					uni.showToast({
+						title: '检测到未知角色，将跳转至默认页面',
+						icon: 'none',
+						duration: 2000
+					});
+					
+					// 延迟跳转，确保提示被用户看到
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/easycode/easycode',
+							success: () => {
+								this.hasJumped = true;
+							},
+							fail: (err) => {
+								console.error('默认角色页面跳转失败:', err);
+								uni.showToast({
+									title: '跳转默认页面失败',
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						});
+					}, 2000);
+				}
+			})
+			.catch(err => {
+				uni.reLaunch({
+					url: '/pages/login'
+				})
+			// 	uni.hideLoading(); // 关闭加载提示
+			// 	console.error('用户信息获取失败:', err);
+				
+			// 	// 区分错误类型，给出更精准提示
+			// 	const errorMsg = err.message || '网络异常，请检查网络后重试';
+			// 	uni.showToast({
+			// 		title: errorMsg,
+			// 		icon: 'none',
+			// 		duration: 3000
 			// 	});
-			// }
-		})
-		
+
+			// 	// 提供重试入口
+			// 	setTimeout(() => {
+			// 		uni.showModal({
+			// 			title: '加载失败',
+			// 			content: '是否重新登录？',
+			// 			success: (res) => {
+			// 				if (res.confirm) {
+			// 					uni.reLaunch({
+			// 						url: '/pages/login'
+			// 					})
+			// 				}
+			// 			}
+			// 		});
+			// 	}, 3000);
+			});
 	}
 }
-
-
-// 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
-// 			}
-// 		},
-// 		setActive({ index, line }) {
-// 			this.active = index;
-// 		}
-// 	}
-// }
 </script>
 
 <style scoped lang="scss">
-/* 主容器 - 简洁背景 */
+/* 样式保持不变 */
 .production-page {
 	min-height: 100vh;
 	background: #f6f6f6;
 }
 
-/* 顶部装饰 */
 .page-header {
 	display: flex;
 	align-items: center;
@@ -124,8 +170,7 @@ export default {
 	background: #fff;
 }
 
-/* 内容容器 */
 .content-wrapper {
 	padding: 0;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/apps/hand-factory/pages/scansuccess/scansuccess.vue b/apps/hand-factory/pages/scansuccess/scansuccess.vue
new file mode 100644
index 0000000..eea494f
--- /dev/null
+++ b/apps/hand-factory/pages/scansuccess/scansuccess.vue
@@ -0,0 +1,142 @@
+<template>
+  <view class="scan-success-page">
+    <!-- 成功图标 -->
+    <view class="success-icon">
+      <view class="icon-circle">
+        <view class="icon-check"></view>
+      </view>
+    </view>
+
+    <!-- 成功提示文字 -->
+    <view class="success-text">
+      <text class="main-text">扫码成功</text>
+      <text class="sub-text">信息已验证通过</text>
+    </view>
+
+    <!-- 返回按钮 -->
+    <button class="back-btn" @click="handleBack">
+      返回
+    </button>
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    // 处理返回逻辑
+    handleBack() {
+      // 返回上一页，如果是从首页跳转可改为switchTab
+      uni.navigateBack({
+        delta: 1,
+        fail: () => {
+          // 若返回失败则改用switchTab跳转
+          uni.switchTab({
+            url: '/pages/code/code'
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.scan-success-page {
+  min-height: 100vh;
+  background-color: #ffffff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 40rpx;
+}
+
+// 成功图标样式
+.success-icon {
+  margin-bottom: 60rpx;
+
+  .icon-circle {
+    width: 180rpx;
+    height: 180rpx;
+    border-radius: 50%;
+    background-color: #eaffea;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    animation: circleScale 0.5s ease-out;
+
+    .icon-check {
+      width: 100rpx;
+      height: 50rpx;
+      border-left: 10rpx solid #00b42a;
+      border-bottom: 10rpx solid #00b42a;
+      transform: rotate(-45deg);
+      animation: checkShow 0.3s ease-out 0.2s backwards;
+    }
+  }
+}
+
+// 文字提示样式
+.success-text {
+  text-align: center;
+  margin-bottom: 100rpx;
+
+  .main-text {
+    font-size: 36rpx;
+    color: #333333;
+    font-weight: 600;
+    display: block;
+    margin-bottom: 20rpx;
+  }
+
+  .sub-text {
+    font-size: 28rpx;
+    color: #666666;
+  }
+}
+
+// 返回按钮样式
+.back-btn {
+  width: 100%;
+  height: 90rpx;
+  line-height: 90rpx;
+  background-color: #007aff;
+  color: #ffffff;
+  font-size: 32rpx;
+  border-radius: 45rpx;
+  margin-top: 40rpx;
+  box-shadow: 0 4rpx 10rpx rgba(0, 122, 255, 0.3);
+  transition: all 0.2s ease;
+
+  &:active {
+    background-color: #0066cc;
+    transform: scale(0.98);
+  }
+}
+
+// 动画定义
+@keyframes circleScale {
+  0% {
+    transform: scale(0);
+    opacity: 0;
+  }
+  70% {
+    transform: scale(1.1);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+@keyframes checkShow {
+  0% {
+    opacity: 0;
+    transform: rotate(-45deg) scale(0.5);
+  }
+  100% {
+    opacity: 1;
+    transform: rotate(-45deg) scale(1);
+  }
+}
+</style>
\ No newline at end of file