diff --git a/pages.json b/pages.json
index 54578d8..1fb627d 100644
--- a/pages.json
+++ b/pages.json
@@ -402,6 +402,38 @@
             }
             
         }
+        ,{
+            "path" : "pages/zw/jb-lower-mater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/zw/jb-up-mater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/zw/jb-return-mater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/zw/materbox-instore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 16e5d81..5ce115c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,6 +41,7 @@
 			return {
 				userName: '',
 				menuList: [
+					{title: '解包', path: 'RF10', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶入库', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}]},
 					{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
 					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
diff --git a/pages/zw/jb-lower-mater.vue b/pages/zw/jb-lower-mater.vue
new file mode 100644
index 0000000..ed1ab7e
--- /dev/null
+++ b/pages/zw/jb-lower-mater.vue
@@ -0,0 +1,222 @@
+<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 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">设备点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料重量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">托盘编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="val1"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">料桶编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="val2"/>
+					</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>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_spec}}</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-6 button-primary" @tap="seachList">查询工单</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				options2: [],
+				index2: '',
+				id: '',
+				code: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 100
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.id = options.id
+		},
+		created () {
+			this._getRegion()
+		},
+		methods: {
+			async _getRegion () {
+				try {
+					let res = await getRegion('YZHJ')
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._linegetMaterialDtl()
+				}
+			},
+			seachList () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this._linegetMaterialDtl()
+			},
+			async _linegetMaterialDtl () {
+				let res = await linegetMaterialDtl(this.index)
+				if (res.code === '200') {
+					this.dataList = res.data
+					// 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._linegetMaterialDtl()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			async _callMaterialConfirm () {
+				this.disabled = true
+				if (!this.dataList.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callMaterialConfirm(this.index, this.val1, this.pkObj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/zw/jb-return-mater.vue b/pages/zw/jb-return-mater.vue
new file mode 100644
index 0000000..f8af3c4
--- /dev/null
+++ b/pages/zw/jb-return-mater.vue
@@ -0,0 +1,206 @@
+<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 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">设备点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">托盘编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box 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>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_spec}}</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-6 button-primary" @tap="seachList">查询工单</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				options2: [],
+				index2: '',
+				id: '',
+				code: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 100
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.id = options.id
+		},
+		created () {
+			this._getRegion()
+		},
+		methods: {
+			async _getRegion () {
+				try {
+					let res = await getRegion('YZHJ')
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._linegetMaterialDtl()
+				}
+			},
+			seachList () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this._linegetMaterialDtl()
+			},
+			async _linegetMaterialDtl () {
+				let res = await linegetMaterialDtl(this.index)
+				if (res.code === '200') {
+					this.dataList = res.data
+					// 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._linegetMaterialDtl()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			async _callMaterialConfirm () {
+				this.disabled = true
+				if (!this.dataList.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callMaterialConfirm(this.index, this.val1, this.pkObj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/zw/jb-up-mater.vue b/pages/zw/jb-up-mater.vue
new file mode 100644
index 0000000..a0cb0ee
--- /dev/null
+++ b/pages/zw/jb-up-mater.vue
@@ -0,0 +1,189 @@
+<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 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">设备点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</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>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_spec}}</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-6 button-primary" @tap="seachList">查询工单</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">开工</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				options2: [],
+				index2: '',
+				id: '',
+				code: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 100
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.id = options.id
+		},
+		created () {
+			this._getRegion()
+		},
+		methods: {
+			async _getRegion () {
+				try {
+					let res = await getRegion('YZHJ')
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index = e
+			},
+			seachList () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this._linegetMaterialDtl()
+			},
+			async _linegetMaterialDtl () {
+				let res = await linegetMaterialDtl(this.index)
+				if (res.code === '200') {
+					this.dataList = res.data
+					// 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._linegetMaterialDtl()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			async _callMaterialConfirm () {
+				this.disabled = true
+				if (!this.dataList.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callMaterialConfirm(this.index, this.pkObj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/zw/materbox-instore.vue b/pages/zw/materbox-instore.vue
new file mode 100644
index 0000000..2dc7bad
--- /dev/null
+++ b/pages/zw/materbox-instore.vue
@@ -0,0 +1,95 @@
+<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-17">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">料桶编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('1')">检查站点</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('0')">确认放置</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {bindOrUnbind} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false,
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			},
+			async _bindOrUnbind (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await bindOrUnbind(this.val1, this.val2, type)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>