diff --git a/apps/hand-factory/App.vue b/apps/hand-factory/App.vue
index 1495a49..afb272b 100644
--- a/apps/hand-factory/App.vue
+++ b/apps/hand-factory/App.vue
@@ -6,7 +6,8 @@
   export default {
     onLaunch: function() { 
       this.initApp()
-			updateManager.checkUpdate(); 
+			updateManager.checkUpdate();
+			plus.navigator.closeSplashscreen()
     },
     methods: {
       // 初始化应用
@@ -17,14 +18,7 @@
         //#ifdef H5
         this.checkLogin()
         //#endif
-				// uni.hideTabBar()
       },
-			// mounted() {
-			// 	uni.hideTabBar()
-			// },
-			// onShow() {
-			// 	uni.hideTabBar()
-			// },
       initConfig() {
         this.globalData.config = config
       },
diff --git a/apps/hand-factory/api/wms/deliveryWaybill.js b/apps/hand-factory/api/wms/deliveryWaybill.js
new file mode 100644
index 0000000..53030bc
--- /dev/null
+++ b/apps/hand-factory/api/wms/deliveryWaybill.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询发货单主列表
+export function listDeliveryWaybill(query) {
+  return request({
+    url: '/wms/deliveryWaybill/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发货单主详细
+export function getDeliveryWaybill(waybillId) {
+  return request({
+    url: '/wms/deliveryWaybill/' + waybillId,
+    method: 'get'
+  })
+}
+
+// 新增发货单主
+export function addDeliveryWaybill(data) {
+  return request({
+    url: '/wms/deliveryWaybill',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货单主
+export function updateDeliveryWaybill(data) {
+  return request({
+    url: '/wms/deliveryWaybill',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货单主
+export function delDeliveryWaybill(waybillId) {
+  return request({
+    url: '/wms/deliveryWaybill/' + waybillId,
+    method: 'delete'
+  })
+}
+
+export function updateDeliveryWaybillStatus(data) {
+  return request({
+    url: '/wms/deliveryWaybill/status',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/apps/hand-factory/api/wms/deliveryWaybillDetail.js b/apps/hand-factory/api/wms/deliveryWaybillDetail.js
new file mode 100644
index 0000000..6a93e87
--- /dev/null
+++ b/apps/hand-factory/api/wms/deliveryWaybillDetail.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询发货单明细列表
+export function listDeliveryWaybillDetail(query) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发货单明细详细
+export function getDeliveryWaybillDetail(detailId) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/' + detailId,
+    method: 'get'
+  })
+}
+
+// 新增发货单明细
+export function addDeliveryWaybillDetail(data) {
+  return request({
+    url: '/wms/deliveryWaybillDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货单明细
+export function updateDeliveryWaybillDetail(data) {
+  return request({
+    url: '/wms/deliveryWaybillDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货单明细
+export function delDeliveryWaybillDetail(detailId) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/' + detailId,
+    method: 'delete'
+  })
+}
+
+// 批量新增发货单明细
+export function batchAddDeliveryWaybillDetail(data) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/batch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询已绑定发货的钢卷列表
+export function listBoundCoil(query) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/boundCoilList',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index 49f628e..fbd4007 100644
--- a/apps/hand-factory/config.js
+++ b/apps/hand-factory/config.js
@@ -9,7 +9,7 @@ module.exports = {
     // 应用名称
     name: "ruoyi-app",
     // 应用版本
-    version: "1.3.28",
+    version: "1.3.29",
     // 应用logo
     logo: "/static/logo.jpg",
     // 官方网站
diff --git a/apps/hand-factory/pages.json b/apps/hand-factory/pages.json
index 0252781..c4c3a32 100644
--- a/apps/hand-factory/pages.json
+++ b/apps/hand-factory/pages.json
@@ -94,59 +94,13 @@
 		"style": {
 			"navigationBarTitleText": "报餐情况"
 		}
+	},
+	{
+		"path": "pages/fahuo/fahuo",
+		"style": {
+			"navigationBarTitleText": "发货"
+		}
 	}
-	// {
-	//   "path": "pages/register",
-	//   "style": {
-	//     "navigationBarTitleText": "注册"
-	//   }
-	// },  {
-	//   "path": "pages/work/index",
-	//   "style": {
-	//     "navigationBarTitleText": "工作台"
-	//   }
-	// }, 
-	// {
-  //   "path": "pages/mine/avatar/index",
-  //   "style": {
-  //     "navigationBarTitleText": "修改头像"
-  //   }
-  // }, {
-  //   "path": "pages/mine/info/edit",
-  //   "style": {
-  //     "navigationBarTitleText": "编辑资料"
-  //   }
-  // }, {
-  //   "path": "pages/mine/pwd/index",
-  //   "style": {
-  //     "navigationBarTitleText": "修改密码"
-  //   }
-  // }, {
-  //   "path": "pages/mine/setting/index",
-  //   "style": {
-  //     "navigationBarTitleText": "应用设置"
-  //   }
-  // }, {
-  //   "path": "pages/mine/help/index",
-  //   "style": {
-  //     "navigationBarTitleText": "常见问题"
-  //   }
-  // }, {
-  //   "path": "pages/mine/about/index",
-  //   "style": {
-  //     "navigationBarTitleText": "关于我们"
-  //   }
-  // }, {
-  //   "path": "pages/common/webview/index",
-  //   "style": {
-  //     "navigationBarTitleText": "浏览网页"
-  //   }
-  // }, {
-  //   "path": "pages/common/textview/index",
-  //   "style": {
-  //     "navigationBarTitleText": "浏览文本"
-  //   }
-  // },
 	],
   "globalStyle": {
     "navigationBarTextStyle": "black",
@@ -162,36 +116,36 @@
 				"selectedIconPath": "/static/images/tabbar/home_.png",
 				"iconPath": "/static/images/tabbar/home.png"
 			},
-			// {
-			// 	"text": "扫码",
-			// 	"pagePath": "pages/code/code",
-			// 	"selectedIconPath": "/static/images/tabbar/work_.png",
-			// 	"iconPath": "/static/images/tabbar/work.png"
-			// },
 			{
 				"text": "扫码",
 				"pagePath": "pages/easycode/easycode",
 				"selectedIconPath": "/static/images/tabbar/work_.png",
 				"iconPath": "/static/images/tabbar/work.png"
 			},
-			{
-				"text": "收货",
-				"pagePath": "pages/receive/receive",
-				"selectedIconPath": "/static/images/tabbar/receive_.png",
-				"iconPath": "/static/images/tabbar/receive.png"
-			},
-			{
-				"text": "查找",
-				"pagePath": "pages/search/search",
-				"selectedIconPath": "/static/images/tabbar/search_.png",
-				"iconPath": "/static/images/tabbar/search.png"
-			},
+			// {
+			// 	"text": "收货",
+			// 	"pagePath": "pages/receive/receive",
+			// 	"selectedIconPath": "/static/images/tabbar/receive_.png",
+			// 	"iconPath": "/static/images/tabbar/receive.png"
+			// },
+			// {
+			// 	"text": "查找",
+			// 	"pagePath": "pages/search/search",
+			// 	"selectedIconPath": "/static/images/tabbar/search_.png",
+			// 	"iconPath": "/static/images/tabbar/search.png"
+			// },
 			{
 				"text": "报餐",
 				"pagePath": "pages/meal/meal",
 				"selectedIconPath": "/static/images/tabbar/meal_.png",
 				"iconPath": "/static/images/tabbar/meal.png"
 			},
+			{
+				"text": "发货",
+				"pagePath": "pages/fahuo/fahuo",
+				"selectedIconPath": "/static/images/tabbar/fahuo_.png",
+				"iconPath": "/static/images/tabbar/fahuo.png"
+			},
 			{
 				"text": "我的",
 				"pagePath": "pages/mine/index",
@@ -208,4 +162,5 @@
 			"k-(.*)": "@/components/klp-ui/k-$1/k-$1.vue"
 		}
 	}
+	
 }
diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue
index 7892db9..612da33 100644
--- a/apps/hand-factory/pages/easycode/easycode.vue
+++ b/apps/hand-factory/pages/easycode/easycode.vue
@@ -137,19 +137,19 @@
 						</view>
 						<view class="info-item">
 							<text class="item-label">厂家</text>
-							<text class="item-value">{{ (coilDetail.product && coilDetail.product.manufacturer) || (coilDetail.rawMaterial && coilDetail.rawMaterial.manufacturer) || '-' }}</text>
+							<text class="item-value">{{ (coilDetail.manufacturer) || '-' }}</text>
 						</view>
 						<view class="info-item">
 							<text class="item-label">材质</text>
-							<text class="item-value">{{ (coilDetail.product && coilDetail.product.material) || (coilDetail.rawMaterial && coilDetail.rawMaterial.material) || '-' }}</text>
+							<text class="item-value">{{ (coilDetail.material) || '-' }}</text>
 						</view>
 						<view class="info-item">
 							<text class="item-label">规格</text>
-							<text class="item-value">{{ (coilDetail.product && coilDetail.product.specification) || (coilDetail.rawMaterial && coilDetail.rawMaterial.specification) || '-' }}</text>
+							<text class="item-value">{{ (coilDetail.specification) || '-' }}</text>
 						</view>
 						<view class="info-item">
 							<text class="item-label">品名</text>
-							<text class="item-value">{{ (coilDetail.product && coilDetail.product.productName) || (coilDetail.rawMaterial && coilDetail.rawMaterial.productName) || '-' }}</text>
+							<text class="item-value">{{ (coilDetail.itemName) || '-' }}</text>
 						</view>
 					</view>
 				</view>
@@ -847,6 +847,7 @@
 		},
 		mounted() {
 			getDicts('action_type').then(res => {
+				console.log(res.data)
 				this.types = res.data
 			})
 		}
diff --git a/apps/hand-factory/pages/easycode/editby.vue b/apps/hand-factory/pages/easycode/editby.vue
index ea7fcd6..9d10236 100644
--- a/apps/hand-factory/pages/easycode/editby.vue
+++ b/apps/hand-factory/pages/easycode/editby.vue
@@ -126,10 +126,10 @@
 					this.form = res.data;
 					this.coilDetail = {
 						...res.data,
-						itemName: res.data.materialType == '成品' ? res.data.product.productName : res.data.rawMaterial.rawMaterialName,
-						itemSpecification: res.data.materialType == '成品' ? res.data.product.specification : res.data.rawMaterial.specification,
-						itemManufacturer: res.data.materialType == '成品' ? res.data.product.manufacturer : res.data.rawMaterial.manufacturer, 
-						itemMaterial: res.data.materialType == '成品' ? res.data.product.material : res.data.rawMaterial.material
+						itemName: res.data.itemName,
+						itemSpecification: res.data.specification,
+						itemManufacturer: res.data.manufacturer, 
+						itemMaterial: res.data.material
 					};
 					console.log('钢卷信息', this.form, )
 				})
diff --git a/apps/hand-factory/pages/fahuo/fahuo.vue b/apps/hand-factory/pages/fahuo/fahuo.vue
new file mode 100644
index 0000000..2d84354
--- /dev/null
+++ b/apps/hand-factory/pages/fahuo/fahuo.vue
@@ -0,0 +1,798 @@
+<template>
+	<view class="container">
+		<!-- 筛选栏 -->
+		<view class="filter-bar">
+			<!-- 左侧：发货计划选择 -->
+			<view class="plan-select" @click="openPlanPopup">
+				<uni-icons type="shop" size="20" color="#666"></uni-icons>
+				<text class="plan-text">{{ currentPlan.planNo || '选择发货单据' }}</text>
+				<uni-icons type="arrowright" size="16" color="#999"></uni-icons>
+			</view>
+		</view>
+
+		<!-- 发货计划选择悬浮窗 -->
+		<uni-popup ref="planPopup" type="bottom" :mask-click="true" height="70%">
+			<view class="popup-container">
+				<!-- 弹窗头部 -->
+				<view class="popup-header"> 
+					<text class="popup-title">选择发货单据</text>
+					<uni-icons type="close" size="20" @click="closePlanPopup"></uni-icons>
+				</view>
+
+				<!-- 计划筛选输入框 -->
+				<view class="plan-search">
+					<input v-model="planKeyword" placeholder="请输入发货单号筛选" clearable class="plan-search-input"
+						@confirm="fetchDeliveryPlan"></input>
+					<uni-icons type="search" size="18" color="#666" @click="fetchDeliveryPlan(true)"></uni-icons>
+				</view>
+
+				<!-- 发货计划列表 -->
+				<scroll-view class="detail-scroll" scroll-y>
+					<view class="form-card">
+						<uni-list v-if="planList.length">
+							<uni-list-item v-for="(item, index) in planList" :key="index" 
+								:title="item.waybillName + '-' + item.consigneeUnit" 
+								:note="item.licensePlate + '(' + item.principal + ')'"
+								clickable
+								@click="selectPlan(item)"></uni-list-item>
+						</uni-list>
+						<view class="empty-tip" v-else>暂无发货计划数据</view>
+					</view>
+					
+					<!-- 加载更多 -->
+					<uni-load-more :status="planHasMore ? 'more' : 'noMore'" @clickLoadMore="fetchDeliveryPlan(false)"
+						v-if="planList.length"></uni-load-more>
+				</scroll-view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref='viewPopup' type="bottom" :mask-click="true" height="70%">
+			<view class="popup-container">
+				<!-- 弹窗头部：标题+关闭按钮 -->
+				<view class="popup-header">
+					<text class="popup-title">钢卷详情信息</text>
+					<uni-icons type="close" size="20" @click="closeViewPopup"></uni-icons>
+				</view>
+
+				<!-- 详情内容区域（滚动布局，适配多内容） -->
+				<scroll-view class="detail-scroll" scroll-y>
+					<view class="form-card" v-if="form.coilId">
+						<!-- 基础信息网格 -->
+						<view class="info-grid">
+							<view class="info-item">
+								<text class="item-label">入场钢卷号</text>
+								<text class="item-value">{{ form.enterCoilNo || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">钢卷号</text>
+								<text class="item-value">{{ form.currentCoilNo || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">班组</text>
+								<text class="item-value">{{ form.team || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">数据类型</text>
+								<text
+									class="item-value">{{ form.dataType === 0 ? '默认数据' : form.dataType === 10 ? '待发货数据' : '-' }}</text>
+							</view>
+							<view class="info-item full-width">
+								<text class="item-label">逻辑库位</text>
+								<text class="item-value">{{ form.warehouseName || '-' }}</text>
+							</view>
+							<view class="info-item full-width">
+								<text class="item-label">实际库位</text>
+								<text class="item-value">{{ form.actualWarehouseName || '-' }}</text>
+							</view>
+						</view>
+
+						<!-- 物料信息 -->
+						<view class="card-title" style="margin-top: 30rpx;">
+							<text class="title-dot"></text>
+							<text class="title-text">物料信息</text>
+						</view>
+						<view class="info-grid">
+							<view class="info-item">
+								<text class="item-label">物品名称</text>
+								<text class="item-value">{{ form.itemName || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">规格</text>
+								<text class="item-value">{{ form.specification || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">材质</text>
+								<text class="item-value">{{ form.material || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">厂家</text>
+								<text class="item-value">{{ form.manufacturer || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">表面处理</text>
+								<text class="item-value">{{ form.surfaceTreatmentDesc || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">镀层质量</text>
+								<text class="item-value">{{ form.zincLayer || '-' }}</text>
+							</view>
+						</view>
+
+						<!-- 重量信息 -->
+						<view class="card-title" style="margin-top: 30rpx;">
+							<text class="title-dot"></text>
+							<text class="title-text">数据信息</text>
+						</view>
+						<view class="info-grid">
+							<view class="info-item">
+								<text class="item-label">毛重（吨）</text>
+								<text class="item-value">{{ form.grossWeight || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">净重（吨）</text>
+								<text class="item-value">{{ form.netWeight || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">长度（m）</text>
+								<text class="item-value">{{ form.length || '-' }}</text>
+							</view>
+						</view>
+
+						<!-- 操作信息 -->
+						<view class="card-title" style="margin-top: 30rpx;">
+							<text class="title-dot"></text>
+							<text class="title-text">操作信息</text>
+						</view>
+						<view class="info-grid">
+							<view class="info-item">
+								<text class="item-label">操作人</text>
+								<text class="item-value">{{ operatorName }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">更新时间</text>
+								<text class="item-value">{{ currentAction.updateTime || '-' }}</text>
+							</view>
+							<view class="info-item full-width">
+								<text class="item-label">操作状态</text>
+								<text
+									class="item-value">{{ currentAction.actionStatus === 0 ? '未开始' : currentAction.actionStatus === 2 ? '已完成' : '-' }}</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 空数据提示 -->
+					<view class="empty-tip" v-else>
+						暂无钢卷详情数据
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+
+		<!-- 主列表区域 -->
+		<view class="main-list">
+			<scroll-view class="list-scroll" scroll-y>
+				<uni-list v-if="list.length">
+					<uni-list-item v-for="(item, index) in list" :key="index" @click=""
+						:title="`钢卷号：${item.coilNo || '-'}`" :note="`操作时间：${item.updateTime || '-'}`">
+						<template v-slot:footer>
+							<button style="margin-right: 10rpx;" size="mini" type="primary" plain="true" @click="openViewPopup(item)">查看</button>
+						</template>
+					</uni-list-item>
+				</uni-list>
+				<view class="empty-tip" v-else>暂无待操作数据</view>
+
+				<!-- 加载更多 -->
+				<uni-load-more :status="hasMore ? 'more' : 'noMore'" @clickLoadMore="fetchList(false)"
+					v-if="list.length"></uni-load-more>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		listDeliveryWaybill
+	} from '@/api/wms/deliveryWaybill.js'
+	import {
+		listDeliveryPlan
+	} from '@/api/wms/deliveryPlan.js';
+	import {
+		listDeliveryWaybillDetail
+	} from '@/api/wms/deliveryWaybillDetail.js'
+	import {
+		updateMaterialCoilSimple,
+		getMaterialCoil
+	} from '@/api/wms/coil.js'
+
+	// 入库操作编码
+	const ACTION_TYPE = 401;
+	// 发货计划类型编码
+	const RECEIVE_PLAN_TYPE = 2;
+	// 未开始操作状态
+	const ACTION_STATUS = 0;
+
+	export default {
+		data() {
+			return {
+				// 主列表数据
+				list: [],
+				currentPlan: {}, // 当前选中的发货计划
+				currentCoilNo: undefined, // 当前输入的钢卷号
+				hasMore: true, // 是否有更多主列表数据
+				pageNum: 1, // 主列表页码
+				pageSize: 10, // 每页条数
+				refreshing: false, // 下拉刷新状态
+
+				// 发货计划弹窗相关
+				planKeyword: '', // 计划筛选关键词
+				planList: [], // 发货计划列表
+				planHasMore: true, // 计划列表是否有更多
+				planPageNum: 1, // 计划列表页码
+				popupShow: false, // 弹窗显示状态
+
+				form: {},
+				loading: false,
+				currentAction: {},
+				loadingDetail: false,
+			};
+		},
+		computed: {
+			// 获取当前操作者昵称
+			operatorName() {
+				return this.$store.state.user.nickName || this.$store.state.user.name || '未知'
+			}
+		},
+		onShow() {
+			// 页面显示时初始化加载数据
+			this.fetchList(true);
+		},
+		methods: {
+			/**
+			 * 获取待操作列表数据
+			 * @param {Boolean} isRefresh 是否刷新（重置页码）
+			 */
+			async fetchList(isRefresh = false) {
+				if (!this.hasMore) {
+					return;
+				}
+				try {
+					// 刷新时重置页码和加载状态
+					if (isRefresh) {
+						this.pageNum = 1;
+						this.refreshing = true;
+					}
+
+					// 构造请求参数
+					const params = {
+						pageNum: this.pageNum,
+						waybillId: this.currentPlan.waybillId,
+						pageSize: this.pageSize
+					};
+
+					// 请求接口
+					const res = await listDeliveryWaybillDetail(params);
+					if (res.code === 200) {
+						const list = res.rows || [];
+						// 刷新时替换数据，加载更多时追加数据
+						this.list = isRefresh ? list : [...this.list, ...list];
+						// 判断是否有更多数据
+						this.hasMore = this.pageNum * this.pageSize < res.total;
+					}
+
+					console.log(this.list, '需要渲染的数据')
+				} catch (err) {
+					console.error('获取待操作列表失败：', err);
+					uni.showToast({
+						title: '数据加载失败',
+						icon: 'none'
+					});
+				} finally {
+					// 结束下拉刷新状态
+					this.refreshing = false;
+					// 加载更多时页码+1
+					if (!isRefresh) this.pageNum++;
+				}
+			},
+
+			/**
+			 * 获取发货计划列表
+			 * @param {Boolean} isRefresh 是否刷新（重置页码）
+			 */
+			async fetchDeliveryPlan(isRefresh = false) {
+				if (!this.planHasMore) {
+					return;
+				}
+				try {
+					if (isRefresh) {
+						this.planPageNum = 1;
+					}
+
+					// 构造请求参数
+					const params = {
+						waybillName: this.planKeyword || '', // 计划编号筛选
+						pageNum: this.planPageNum,
+						pageSize: this.pageSize,
+					};
+
+					const res = await listDeliveryWaybill(params);
+					if (res.code === 200) {
+						const list = res.rows || [];
+
+						this.planList = isRefresh ? list : [...this.planList, ...list];
+						this.planHasMore = this.planPageNum * this.pageSize < res.total;
+					}
+				} catch (err) {
+					console.error('获取发货单据失败：', err);
+					uni.showToast({
+						title: '计划加载失败',
+						icon: 'none'
+					});
+				} finally {
+					if (!isRefresh) this.planPageNum++;
+				}
+			},
+
+			/**
+			 * 打开发货计划弹窗
+			 */
+			openPlanPopup() {
+				this.$refs.planPopup.open();
+				// 打开弹窗时加载计划数据
+				this.fetchDeliveryPlan(true);
+			},
+
+			/**
+			 * 关闭发货计划弹窗
+			 */
+			closePlanPopup() {
+				this.$refs.planPopup.close();
+			},
+
+			/**
+			 * 打开发货弹窗
+			 */
+			openReceivePopup(row) {
+				this.$refs.receivePopup.open('bottom')
+				// this.loadingDetail = false;
+				uni.showLoading({
+					title: '正在加载发货详情'
+				})
+				getMaterialCoil(row.coilId).then(res => {
+					this.form = res.data;
+					this.currentAction = row;
+					// this.loadingDetail = true
+					uni.hideLoading()
+				})
+			},
+
+			openViewPopup(row) {
+				this.$refs.viewPopup.open('bottom')
+				// this.loadingDetail = false;
+				uni.showLoading({
+					title: '正在加载发货详情'
+				})
+				getMaterialCoil(row.coilId).then(res => {
+					console.log(res.data)
+					this.form = res.data;
+					this.currentAction = row;
+					uni.hideLoading()
+					// this.loadingDetail = true
+				})
+			},
+
+			/**
+			 * 关闭钢卷详情弹窗
+			 */
+			closeViewPopup() {
+				this.$refs.viewPopup.close();
+				// 可选：清空表单临时数据（根据业务需求决定是否保留）
+				this.form = {};
+				this.currentAction = {};
+			},
+
+			/**
+			 * 确认发货
+			 */
+			confirmReceive(row) {
+				const currentAction = this.currentAction;
+				const form = this.form;
+				const that = this;
+				uni.showModal({
+					title: '确定要发货吗？',
+					success() {
+						// console.log(currentAction, form)
+						that.loading = true;
+						Promise.all([
+							updatePendingAction({
+								...currentAction,
+								actionStatus: 2
+							}),
+							updateMaterialCoilSimple({
+								...form,
+								dataType: 1
+							})
+						]).then(_ => {
+							uni.showToast({
+								title: '钢卷已发货'
+							});
+							that.fetchList(true);
+							that.loading = false;
+							that.$refs.receivePopup.close()
+						})
+					}
+				})
+			},
+
+			/**
+			 * 选择发货计划
+			 * @param {Object} plan 选中的计划对象
+			 */
+			selectPlan(plan) {
+				this.currentPlan = plan;
+				this.closePlanPopup();
+				// 选择计划后重新加载主列表
+				this.fetchList(true);
+			},
+
+			/**
+			 * 下拉刷新触发（修正后事件可正常绑定）
+			 */
+			onPullDownRefresh() {
+				this.fetchList(true);
+			},
+
+			/**
+			 * 页面上拉加载（可选：补充页面级上拉加载）
+			 */
+			onReachBottom() {
+				if (this.hasMore) {
+					this.fetchList(false);
+				}
+			}
+		},
+		// 补充页面级上拉加载钩子（可选，增强体验）
+		onReachBottom() {
+			this.onReachBottom();
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.container {
+		width: 100%;
+		height: 100vh;
+		background-color: #f5f5f5;
+		display: flex;
+		flex-direction: column;
+	}
+
+	/* 筛选栏样式 */
+	.filter-bar {
+		display: flex;
+		align-items: center;
+		padding: 10rpx 20rpx;
+		background-color: #fff;
+		border-bottom: 1px solid #eee;
+	}
+
+	.plan-select {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		padding: 10rpx 15rpx;
+		background-color: #f8f8f8;
+		border-radius: 6rpx;
+		margin-right: 20rpx;
+		min-width: 200rpx;
+	}
+
+	.plan-text {
+		font-size: 28rpx;
+		color: #333;
+		flex: 1;
+	}
+
+	.coil-filter {
+		display: flex;
+		align-items: center;
+		flex: 1;
+		background-color: #f8f8f8;
+		border-radius: 6rpx;
+		padding: 0 15rpx;
+	}
+
+	.coil-input {
+		flex: 1;
+		font-size: 28rpx;
+	}
+
+	/* 弹窗样式 */
+	.popup-container {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.popup-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		border-bottom: 1px solid #eee;
+	}
+
+	.popup-title {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.plan-search {
+		display: flex;
+		align-items: center;
+		gap: 10rpx;
+		padding: 15rpx 20rpx;
+		border-bottom: 1px solid #eee;
+	}
+
+	.plan-search-input {
+		flex: 1;
+		font-size: 28rpx;
+	}
+
+	// .plan-list {
+	// 	flex: 1;
+	// 	overflow-y: auto;
+	// 	padding: 10rpx;
+	// }
+
+	/* 列表样式 */
+	.main-list {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.list-scroll {
+		width: 100%;
+		height: 100%;
+	}
+
+	.uni-list {
+		background-color: #fff;
+		margin: 10rpx;
+		border-radius: 8rpx;
+	}
+
+	.uni-list-item {
+		font-size: 28rpx;
+	}
+
+	/* 空数据提示 */
+	.empty-tip {
+		text-align: center;
+		padding: 50rpx 0;
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	/* 加载更多样式 */
+	.uni-load-more {
+		margin: 20rpx 0;
+	}
+
+	.form-card {
+		background: #fff;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		overflow: scroll;
+		height: 70vh;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	}
+
+	.card-title {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 25rpx;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+
+		.title-dot {
+			width: 8rpx;
+			height: 28rpx;
+			background: #007aff;
+			border-radius: 4rpx;
+			margin-right: 12rpx;
+		}
+
+		.title-text {
+			flex: 1;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333;
+		}
+
+		.status-badge {
+			font-size: 22rpx;
+			padding: 4rpx 12rpx;
+			border-radius: 12rpx;
+			margin-right: 10rpx;
+
+			&.status-1 {
+				background: #d1f2eb;
+				color: #0c6957;
+			}
+
+			&.status-0 {
+				background: #f8d7da;
+				color: #721c24;
+			}
+		}
+
+		.more-btn {
+			display: flex;
+			align-items: center;
+			gap: 8rpx;
+			padding: 8rpx 16rpx;
+			background: #f0f7ff;
+			border-radius: 20rpx;
+			border: 1rpx solid #007aff;
+
+			.icon-more {
+				font-size: 24rpx;
+				color: #007aff;
+			}
+
+			.more-text {
+				font-size: 24rpx;
+				color: #007aff;
+			}
+		}
+	}
+
+	/* 信息网格 */
+	.info-grid {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 20rpx;
+
+		.info-item {
+			flex: 1;
+			min-width: 45%;
+			background: #f8f9fa;
+			padding: 20rpx;
+			border-radius: 12rpx;
+
+			&.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;
+			}
+		}
+	}
+
+	/* 表单项 */
+	.form-item {
+		margin-bottom: 30rpx;
+
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+
+		.form-label {
+			display: block;
+			font-size: 28rpx;
+			color: #333;
+			margin-bottom: 15rpx;
+			font-weight: 500;
+
+			&::before {
+				content: '*';
+				color: #ff4d4f;
+				margin-right: 6rpx;
+			}
+		}
+
+		.form-label-optional {
+			display: block;
+			font-size: 28rpx;
+			color: #333;
+			margin-bottom: 15rpx;
+			font-weight: 500;
+		}
+
+		.form-input {
+			width: 100%;
+			height: 88rpx;
+			padding: 0 24rpx;
+			background: #f8f9fa;
+			border: 2rpx solid #e8e8e8;
+			border-radius: 12rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			transition: all 0.3s;
+
+			&:focus {
+				background: #fff;
+				border-color: #007aff;
+			}
+
+			&.form-input-disabled {
+				background: #f5f5f5;
+				color: #999;
+				cursor: not-allowed;
+			}
+		}
+	}
+
+	/* 操作者信息 */
+	.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);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/apps/hand-factory/pages/index.vue b/apps/hand-factory/pages/index.vue
index 625b678..cf7be65 100644
--- a/apps/hand-factory/pages/index.vue
+++ b/apps/hand-factory/pages/index.vue
@@ -1,4 +1,5 @@
 <template>
+	<div></div>
 </template>
 
 <script>
@@ -6,9 +7,9 @@ export default {
 	data() {
 		return {
 			tabVisible: {
-				admin: [true, true, true, true, true, true],
-				canteen: [false, false, false, false, true, true],
-				worker: [false, true, true, true, false, true]
+				admin:   [true,  true,  false, true,  true],
+				canteen: [false, false, true,  false, true],
+				worker:  [false, true,  false, true,  true]
 			},
 			hasJumped: false, // 防止重复跳转的标记
 		}
@@ -86,14 +87,6 @@ export default {
 							visible: v
 						});
 					} 
-					// uni.setTabBarItem({
-					// 	index: 0,
-					// 	visible: false
-					// });
-					// uni.setTabBarItem({
-					// 	index: 4,
-					// 	visible: false
-					// });
 					uni.switchTab({
 						url: '/pages/easycode/easycode',
 						success: () => {
@@ -109,12 +102,6 @@ export default {
 						}
 					});
 				} else {
-					// 处理未定义角色（默认角色）
-					// uni.showToast({
-					// 	title: '检测到未知角色，将跳转至默认页面',
-					// 	icon: 'none',
-					// 	duration: 2000
-					// });
 					for (let i = 0; i < this.tabVisible.worker.length; i++) {
 						const v = this.tabVisible.worker[i]
 						uni.setTabBarItem({
diff --git a/apps/hand-factory/pages/login.vue b/apps/hand-factory/pages/login.vue
index 2af7dcd..7f6328c 100644
--- a/apps/hand-factory/pages/login.vue
+++ b/apps/hand-factory/pages/login.vue
@@ -24,15 +24,6 @@
       <view class="action-btn">
         <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
       </view>
-     <!-- <view class="reg text-center" v-if="register">
-        <text class="text-grey1">没有账号？</text>
-        <text @click="handleUserRegister" class="text-blue">立即注册</text>
-      </view> -->
-     <!-- <view class="xieyi text-center">
-        <text class="text-grey1">登录即代表同意</text>
-        <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
-        <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
-      </view> -->
     </view>
      
   </view>
diff --git a/apps/hand-factory/pages/mine/index.vue b/apps/hand-factory/pages/mine/index.vue
index 1ed71f8..d42897d 100644
--- a/apps/hand-factory/pages/mine/index.vue
+++ b/apps/hand-factory/pages/mine/index.vue
@@ -25,57 +25,20 @@
 			</view>
 		</view>
 
-		<!-- <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">交流群</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-service text-blue icon"></view>
-          <text class="text">在线客服</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
-        </view>
-      </view> -->
-
 		<view class="menu-list">
+			<view class="list-cell list-cell-arrow" @click="handleToSearch">
+				<view class="menu-item-box">
+					<view class="iconfont icon-setting menu-icon"></view>
+					<view>钢卷查找</view>
+				</view>
+			</view>
+			
 			<view class="list-cell list-cell-arrow" @click="handleLogout">
 				<view class="menu-item-box">
 					<view class="iconfont icon-setting menu-icon"></view>
 					<view>退出登录</view>
 				</view>
 			</view>
-			<!--        <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-          <view class="menu-item-box">
-            <view class="iconfont icon-user menu-icon"></view>
-            <view>编辑资料</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleHelp">
-          <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
-            <view>常见问题</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleAbout">
-          <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
-            <view>关于我们</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleToSetting">
-          <view class="menu-item-box">
-            <view class="iconfont icon-setting menu-icon"></view>
-            <view>应用设置</view>
-          </view>
-        </view> -->
 		</view>
 
 	</view>
@@ -98,8 +61,8 @@
 			}
 		},
 		methods: {
-			handleToInfo() {
-				this.$tab.navigateTo('/pages/mine/info/index')
+			handleToSearch() {
+				this.$tab.navigateTo('/pages/search/search')
 			},
 			handleLogout() {
 				this.$modal.confirm('确定注销并退出系统吗？').then(() => {
@@ -108,30 +71,7 @@
 					})
 				})
 			},
-			handleToEditInfo() {
-				this.$tab.navigateTo('/pages/mine/info/edit')
-			},
-			handleToSetting() {
-				this.$tab.navigateTo('/pages/mine/setting/index')
-			},
-			handleToLogin() {
-				this.$tab.reLaunch('/pages/login')
-			},
-			handleToAvatar() {
-				this.$tab.navigateTo('/pages/mine/avatar/index')
-			},
-			handleHelp() {
-				this.$tab.navigateTo('/pages/mine/help/index')
-			},
-			handleAbout() {
-				this.$tab.navigateTo('/pages/mine/about/index')
-			},
-			handleJiaoLiuQun() {
-				this.$modal.showToast('QQ群：①133713780(满)、②146013835(满)、③189091635')
-			},
-			handleBuilding() {
-				this.$modal.showToast('模块建设中~')
-			}
+			
 		}
 	}
 </script>
diff --git a/apps/hand-factory/pages/receive/receive.vue b/apps/hand-factory/pages/receive/receive.vue
index bb3c11c..f05734c 100644
--- a/apps/hand-factory/pages/receive/receive.vue
+++ b/apps/hand-factory/pages/receive/receive.vue
@@ -166,33 +166,29 @@
 							<text class="title-text">物料信息</text>
 						</view>
 						<view class="info-grid">
-							<!-- <view class="info-item">
-								<text class="item-label">物品类型</text>
-								<text class="item-value">{{ form.itemType || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="item-label">物品ID</text>
-								<text class="item-value">{{ form.itemId || '-' }}</text>
-							</view>
-							<view class="info-item full-width">
-								<text class="item-label">物料名称</text>
-								<text class="item-value">{{ form.itemName || '-' }}</text>
-							</view> -->
 							<view class="info-item">
 								<text class="item-label">物品名称</text>
-								<text class="item-value">{{ form.rawMaterial.rawMaterialName || form.product.productName || '-' }}</text>
+								<text class="item-value">{{ form.itemName || '-' }}</text>
 							</view>
 							<view class="info-item">
 								<text class="item-label">规格</text>
-								<text class="item-value">{{ form.rawMaterial.specification || form.product.specification || '-' }}</text>
+								<text class="item-value">{{ form.specification || '-' }}</text>
 							</view>
 							<view class="info-item">
 								<text class="item-label">材质</text>
-								<text class="item-value">{{ form.rawMaterial.material || form.product.material || '-' }}</text>
+								<text class="item-value">{{ form.material || '-' }}</text>
 							</view>
 							<view class="info-item">
 								<text class="item-label">厂家</text>
-								<text class="item-value">{{ form.rawMaterial.manufacturer || form.product.manufacturer || '-' }}</text>
+								<text class="item-value">{{ form.manufacturer || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">表面处理</text>
+								<text class="item-value">{{ form.surfaceTreatmentDesc || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="item-label">镀层质量</text>
+								<text class="item-value">{{ form.zincLayer || '-' }}</text>
 							</view>
 						</view>
 
diff --git a/apps/hand-factory/static/images/tabbar/fahuo.png b/apps/hand-factory/static/images/tabbar/fahuo.png
new file mode 100644
index 0000000..e830da6
Binary files /dev/null and b/apps/hand-factory/static/images/tabbar/fahuo.png differ
diff --git a/apps/hand-factory/static/images/tabbar/fahuo_.png b/apps/hand-factory/static/images/tabbar/fahuo_.png
new file mode 100644
index 0000000..1d69478
Binary files /dev/null and b/apps/hand-factory/static/images/tabbar/fahuo_.png differ
diff --git a/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
index f15d510..36aeb64 100644
--- a/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
+++ b/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -1,5 +1,5 @@
 {
-	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentdown": "点击加载更多",
 	"uni-load-more.contentrefresh": "正在加载...",
 	"uni-load-more.contentnomore": "没有更多数据了"
 }
diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js
index b6e5a1c..01e96b8 100644
--- a/apps/hand-factory/utils/update.js
+++ b/apps/hand-factory/utils/update.js
@@ -73,7 +73,7 @@ function checkStorageSpace() {
 function checkUpdate(forceCheck = false) {
   // 1. 准备本地版本信息
   const localVersion = plus.runtime.version; // 基座版本
-  const staticVersion = '1.3.28'; // 静态默认版本
+  const staticVersion = '1.3.29'; // 静态默认版本
 	// const localWgtVersion = staticVersion;
   const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本（从存储获取或用默认）
   const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 
diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json
index 1446935..a07f917 100644
--- a/apps/hand-factory/version.json
+++ b/apps/hand-factory/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "klp 1.3.28",
+  "version": "klp 1.3.29",
   "wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
   "apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
 }
\ No newline at end of file