diff --git a/pages.json b/pages.json
index b62b37d..0b64441 100644
--- a/pages.json
+++ b/pages.json
@@ -180,6 +180,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/entry/mater-group-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
new file mode 100644
index 0000000..a1e2da1
--- /dev/null
+++ b/pages/entry/mater-group-to-store.vue
@@ -0,0 +1,253 @@
+<template>
+	<view class="zd_container">
+		<!-- 物料组盘入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>物料规格</th>
+								<th>单位</th>
+								<th>物料单重</th>
+								<th>物料批次</th>
+								<th>物料数量</th>
+								<th>载具编码</th>
+								<th>仓库编码</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.stor_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="msg_content">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料单重</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="number" class="filter_input" v-model="single_weight">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="number" class="filter_input" v-model="pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="number" class="filter_input" v-model="qty">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-6">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="vehicle_code"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-6">
+						<span class="filter_label">仓库编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="stor_code"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-7 button-default" @tap="show = false">关闭</button>
+				<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+				<button class="zd-col-7 button-primary" @tap="toSave">保存</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {groupMaterList, groupMaterIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				show: false,
+				single_weight: null,
+				pcsn: null,
+				qty: null,
+				vehicle_code: '',
+				stor_code:'',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = e.material_id
+				this.show = true
+			},
+			clearUp () {
+				this.single_weight = null
+				this.pcsn = null
+				this.qty = null
+				this.vehicle_code = ''
+				this.stor_code = ''
+			},
+			toSave () {
+				this.dataList.map(e => {
+					if (e.material_id === this.pkId) {
+						e.single_weight = this.single_weight
+						e.pcsn = this.pcsn
+						e.qty = this.qty
+						e.vehicle_code = this.vehicle_code
+						e.stor_code = this.stor_code
+					}
+				})
+				this.show = false
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.disabled = false
+				this.pkId = ''
+			},
+			async _groupMaterIn () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				let obj = []
+				this.dataList.map(e => {
+					if (e.material_id === this.pkId) {
+						obj = e
+					}
+				})
+				try {
+					let res = await groupMaterIn(this.stor_code, obj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.toEmpty()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d2a7f25..c443655 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,7 +41,7 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
 					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
diff --git a/utils/getData2.js b/utils/getData2.js
index f67e8c6..3885f68 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,6 +21,17 @@ export const handLogin = (user, password) => request({
 	}
 })
 
+/**
+ * 物料组盘入库
+ */
+export const groupMaterList = (page, size, search) => request({
+	url:'api/groupMater/maters',
+	data: {page: page, size: size, search: search}
+})
+export const groupMaterIn = (code, item) => request({
+	url:'api/groupMater/in',
+	data: {stor_code: code, item: item}
+})
 /**
  * 组盘入库
  */
diff --git a/utils/mork2.js b/utils/mork2.js
index 2f19024..3e5484b 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -57,4 +57,42 @@ export const pmFormData = (code) => {
 		msg: '查询成功'
 	}
 	return res
+}
+
+export const groupMaterList = () => {
+	let res = {
+		totalElements: '2',
+		content: [
+			{
+				material_id: '1',
+				material_name: null,
+				material_code: '100',
+				material_spec: null,
+				single_weight: null,
+				qty: '0.000',
+				assign_qty: '0.000',
+				unit_id: null,
+				pcsn: null,
+				vehicle_code: null,
+				vehicle_id: null
+			},
+			{
+				material_id: '2',
+				material_name: null,
+				material_code: '200',
+				material_spec: null,
+				single_weight: null,
+				qty: '0.000',
+				assign_qty: '0.000',
+				unit_id: null,
+				pcsn: null,
+				vehicle_code: null,
+				vehicle_id: null
+			}
+		],
+		data: null,
+		code: '200',
+		msg: '查询成功'
+	}
+	return res
 }
\ No newline at end of file