diff --git a/pages.json b/pages.json
index 39b35c3..64697b7 100644
--- a/pages.json
+++ b/pages.json
@@ -81,7 +81,13 @@
 			}
 		},
 		{
-			"path": "pages/management/HalfFinishedInStore",
+			"path": "pages/management/DeliveryConfirm",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/management/MaterList",
 			"style": {
 				"navigationStyle": "custom"
 			}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9b5f3ca..abea9b4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -147,8 +147,9 @@
 	flex-direction column
 .sec_menu_w
 	_fj()
-	_wh(100%, calc(100% - 50px))
+	_wh(calc(100% - 30px), calc(100% - 50px))
 	padding 0 12px
+	margin 0 auto
 	flex-wrap wrap
 	align-content center
 	&::after
diff --git a/pages/management/DeliveryConfirm.vue b/pages/management/DeliveryConfirm.vue
new file mode 100644
index 0000000..1a87cf1
--- /dev/null
+++ b/pages/management/DeliveryConfirm.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="content">
+		<nav-bar title="发货确认"></nav-bar>
+		<view class="filter-confirm-wrap">
+			<view class="filter-confirm-wrap-inner">
+				<view class="filter-wrap">
+					<view class="search-item filter-item">
+						<label class="search-label">发货区点位</label>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">载具号</label>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val1"
+							/>
+						</view>
+					</view>
+				</view>
+				<view class="confirm-button-wrap confirm-button-wrap-c">
+					<button class="confirm-button" @tap="toSearch">点位解绑</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !index1}" :disabled="disabled" @tap="toSure">全部解绑</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index1: 'A1',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		methods: {
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			toSearch () {
+			  this.dataList = []
+			  this.pkId = ''
+			  this._inOutExceptionInstQuery()
+			},
+			async _getCacheLine (id) {
+				let res = await getCacheLine(id)
+				this.options2 = [...res]
+			},
+			async _inOutExceptionInstQuery () {
+				let res = await inOutExceptionInstQuery(this.index2)
+				this.dataList = [...res]
+			},
+			async toSure () {
+			  this.disabled = true
+			  if (!this.pkId) {
+				uni.showToast({
+					title: '请选择',
+					icon: 'none'
+				})
+				this.disabled = false
+				return
+			  }
+			  if (!this.index2) {
+				uni.showToast({
+					title: '请选择缓存线',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.index3) {
+				uni.showToast({
+					title: '请选择位置类型',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请扫满箱码',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  try {
+				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
+				this.disabled = false
+				this.toSearch()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			},
+			toRadio (e) {
+			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.filter-confirm-wrap
+	_wh(100%, calc(100% - 72px))
+	background-color #f5f5f5
+	_fj()
+.filter-confirm-wrap-inner
+	width 50%
+	background-color #fff
+	border-radius 12px
+	padding-bottom 15px
+	margin 0 auto
+.filter-wrap
+	width 100%
+	padding 0 15px
+	_fj(center,,column,)
+.filter-item
+	width 100%
+.confirm-button-wrap-c
+	justify-content center
+	margin-top 50px
+</style>
\ No newline at end of file
diff --git a/pages/management/FinishedInStore.vue b/pages/management/FinishedInStore.vue
index 2cf0684..687c801 100644
--- a/pages/management/FinishedInStore.vue
+++ b/pages/management/FinishedInStore.vue
@@ -4,39 +4,24 @@
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
-					<label class="search-label">生产区域</label>
+					<label class="search-label">入库点</label>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">位置类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">满箱码</label>
+					<label class="search-label">载具号</label>
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
 						/>
 					</view>
 				</view>
-				<!-- <view class="search-item search-item-btns">
-					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1}" :disabled="disabled" @tap="toSure">确认</button>
-				</view> -->
 			</view>
 			<view class="confirm-button-wrap">
 				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId}" :disabled="disabled" @tap="toSelect">选择订单</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">入库确认</button>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -44,9 +29,11 @@
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>缓存线编码</th>
-						<th>缓存线位置编码</th>
-						<th>料箱码</th>
+						<th>订单行号</th>
+						<th>规格</th>
+						<th>入库数量</th>
+						<th>物料编码</th>
+						<th>物料名称</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -57,6 +44,8 @@
 						<td>{{e.cacheline_code}}</td>
 						<td>{{e.position_code}}</td>
 						<td>{{e.vehicle_code}}</td>
+						<td></td>
+						<td></td>
 					</tr>
 				</tbody>
 			</table>
@@ -77,10 +66,6 @@
 			return {
 				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
 				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
 				val1: '',
 				dataList: [],
 				pkId: '',
@@ -88,24 +73,11 @@
 			};
 		},
 		created() {
-			this._getCacheLine('A1')
 		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
 				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
 			},
 			toSearch () {
 			  this.dataList = []
@@ -168,12 +140,14 @@
 			},
 			toRadio (e) {
 			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
+			},
+			toSelect () {
+				if (!this.pkId) {
+					uni.navigateTo({
+						url: '/pages/management/MaterList'
+					})
+				}
 			}
 		}
 	}
 </script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-</style>
\ No newline at end of file
diff --git a/pages/management/HcxErrorHandle.vue b/pages/management/HcxErrorHandle.vue
index e1fcdcd..45b282a 100644
--- a/pages/management/HcxErrorHandle.vue
+++ b/pages/management/HcxErrorHandle.vue
@@ -1,25 +1,27 @@
 <template>
 	<view class="content">
 		<nav-bar title="缓存线异常处理"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+		<view class="filter-confirm-wrap">
+			<view class="filter-confirm-wrap-inner">
+				<view class="filter-wrap">
+					<view class="search-item filter-item">
+						<label class="search-label">生产区域</label>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">缓存线</label>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+						</view>
 					</view>
 				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
+				<view class="confirm-button-wrap confirm-button-wrap-c">
+					<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">暂停</button>
+					<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">启动</button>
 				</view>
 			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">暂停</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">启动</button>
-			</view>
 		</view>
 	</view>
 </template>
@@ -89,6 +91,23 @@
 
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
-// .grid-wrap
-// 	height calc(100% - 526rpx)
+.filter-confirm-wrap
+	_wh(100%, calc(100% - 72px))
+	background-color #f5f5f5
+	_fj()
+.filter-confirm-wrap-inner
+	width 50%
+	background-color #fff
+	border-radius 12px
+	padding-bottom 15px
+	margin 0 auto
+.filter-wrap
+	width 100%
+	padding 0 15px
+	_fj(center,,column,)
+.filter-item
+	width 100%
+.confirm-button-wrap-c
+	justify-content center
+	margin-top 50px
 </style>
\ No newline at end of file
diff --git a/pages/management/HalfFinishedInStore.vue b/pages/management/MaterList.vue
similarity index 58%
rename from pages/management/HalfFinishedInStore.vue
rename to pages/management/MaterList.vue
index 741d0cb..91e60b7 100644
--- a/pages/management/HalfFinishedInStore.vue
+++ b/pages/management/MaterList.vue
@@ -1,42 +1,18 @@
 <template>
 	<view class="content">
-		<nav-bar title="半成品入库"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="物料列表"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
-					<label class="search-label">生产区域</label>
+					<label class="search-label">订单</label>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+						<input type="text" class="search-input-l" v-model="val1">
 					</view>
 				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">位置类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">满箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<!-- <view class="search-item search-item-btns">
+				<view class="search-item search-item-btns">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1}" :disabled="disabled" @tap="toSure">确认</button>
-				</view> -->
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
+				</view>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -44,9 +20,12 @@
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>缓存线编码</th>
-						<th>缓存线位置编码</th>
-						<th>料箱码</th>
+						<th>订单行号</th>
+						<th>规格</th>
+						<th>订单数量</th>
+						<th>入库数量</th>
+						<th>物料编码</th>
+						<th>物料名称</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -57,6 +36,9 @@
 						<td>{{e.cacheline_code}}</td>
 						<td>{{e.position_code}}</td>
 						<td>{{e.vehicle_code}}</td>
+						<td></td>
+						<td></td>
+						<td></td>
 					</tr>
 				</tbody>
 			</table>
@@ -75,38 +57,13 @@
 		},
 		data() {
 			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
 				val1: '',
 				dataList: [],
 				pkId: '',
 				disabled: false
 			};
 		},
-		created() {
-			this._getCacheLine('A1')
-		},
 		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
 			toSearch () {
 			  this.dataList = []
 			  this.pkId = ''
@@ -168,6 +125,11 @@
 			},
 			toRadio (e) {
 			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
+			},
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/management/FinishedInStore'
+				})
 			}
 		}
 	}
@@ -175,5 +137,5 @@
 
 <style lang="stylus" scoped>
 .grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+    height: calc(100% - 137px); /** 42+ 15*4+ 35*1 */
 </style>
\ No newline at end of file
diff --git a/utils/getData2.js b/utils/getData2.js
index 205ef2b..424fbd3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -39,7 +39,7 @@ export const authority = () => {
 			},
 			{menu_id: '3', path: 'RF03', name: '出入库管理', sonTree: [
 				{menu_id: '1', name: '成品入库', path: '/pages/management/FinishedInStore'},
-				{menu_id: '2', name: '半成品入库', path: '/pages/management/HalfFinishedInStore'}
+				{menu_id: '2', name: '发货确认', path: '/pages/management/DeliveryConfirm'}
 				]
 			}
 		]