diff --git a/pages/home/home.vue b/pages/home/home.vue
index 21175c6..fe62546 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -53,8 +53,11 @@
 				// 	{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
 				// ],
 				menuList: [
-					{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-					{menu_id: '3', icon: 'RF03', name: '人工分拣', path: '', sonTree: [
+					{menu_id: '1', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
+					{menu_id: '2', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []},
+					{menu_id: '3', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
+					{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
+					{menu_id: '5', icon: 'RF09', name: '人工分拣', path: '', sonTree: [
 						{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
 						{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
 						{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
@@ -63,9 +66,8 @@
 						{menu_id: '6', name: '呼叫木盘', path: '/pages/modules/call-mupan'},
 						{menu_id: '7', name: '空盘入库', path: '/pages/modules/empty-instore'}
 					]},
-					{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-					{menu_id: '5', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-					{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
+					{menu_id: '6', icon: 'RF10', name: '压机搬运', path: '/pages/modules/press-carry', sonTree: []},
+					{menu_id: '7', icon: 'RF08', name: '货架盘点', path: '/pages/modules/shelf-check', sonTree: []}
 				],
 				show: false,
 				secM: []
diff --git a/pages/modules/shelf-check.vue b/pages/modules/shelf-check.vue
index 239d03a..ce23c65 100644
--- a/pages/modules/shelf-check.vue
+++ b/pages/modules/shelf-check.vue
@@ -1,19 +1,142 @@
 <template>
-	<view>
-		
+	<view class="zd_container">
+		<nav-bar title="货架盘点"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">库位编码</view>
+					<view class="filter_input_wraper">
+						<input type="text" placeholder="输入货架号码" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">库位状态</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view v-show="index === '2' || index === '3'" class="filter_item">
+					<view class="filter_label">托盘编码</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<view v-show="index === '3'" class="filter_item">
+					<view class="filter_label">砖块数量</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view v-show="index === '3'" class="filter_item">
+					<view class="filter_label">物料编码</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val4">
+					</view>
+				</view>
+			</view>
+			<view v-show="index === '3'" class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>物料规格</th>
+								<th>物料型号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.material_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_shelfMaterialQuery">查询</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !index || (index === '2' && !val2) || (index === '3' && (!val2 || !val3 || !pkId))}" :disabled="disabled" @tap="toSure">确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import {shelfMaterialQuery, shelfUpdateData} from '@/utils/getData2.js'
+	import {dateTimeFtt} from '@/utils/utils.js'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
-				
+				val1: '',
+				index: '',
+				options: [{value: '1', text: '空位'}, {value: '2', text: '空盘'}, {value: '3', text: '有料'}],
+				val2: '',
+				val3: '',
+				val4: '',
+				dataList: [],
+				pkId: '',
+				disabled: false
 			};
+		},
+		methods: {
+			selectChange(e) {
+				this.index = e
+			},
+			/** grid查询 */
+			async _shelfMaterialQuery () {
+				let res = await shelfMaterialQuery(this.val4)
+				this.dataList = [...res]
+			},
+			/** 确认 */
+			async toSure () {
+				this.disabled = true
+				if (!this.val1 || !this.index || (this.index === '2' && !this.val2) || (this.index === '3' && (!this.val2 || !this.val3 || !this.pkId))) {
+					this.disabled = false
+					return
+				}
+				try {
+					let vcode = ''
+					let qty = ''
+					let id = ''
+					if (this.index === '2') {
+						vcode = this.val2
+					}
+					if (this.index === '3') {
+						vcode = this.val2
+						qty = this.val3
+						id = this.pkId
+					}
+					let res = await shelfUpdateData(this.val1, this.index, vcode, qty, id)
+					this.disabled = false
+					this.pkId = ''
+					this.val1 = ''
+					this.index = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
 </style>
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
new file mode 100644
index 0000000..d2b969b
Binary files /dev/null and b/static/image/menu/RF08.png differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
new file mode 100644
index 0000000..972a492
Binary files /dev/null and b/static/image/menu/RF09.png differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000..7e9ddd2
Binary files /dev/null and b/static/image/menu/RF10.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 3627a4a..10e8739 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -133,4 +133,26 @@ export const manualSortingPackingTask = (code, qty, sqty) => request({
 		qty: qty,
 		surplus_quantity: sqty
 	}
+})
+
+/**
+ * 货架盘点
+ */
+// 物料查询
+export const shelfMaterialQuery = (code) => request({
+	url:'api/pda/shelf/materialQuery',
+	data: {
+		material_code: code
+	}
+})
+// 确认
+export const shelfUpdateData = (code, status, vcode, qty, id) => request({
+	url:'api/pda/shelf/updateData',
+	data: {
+		point_code: code,
+		point_status: status,
+		vehicle_code: vcode,
+		material_qty: qty,
+		material_id: id
+	}
 })
\ No newline at end of file