From 9e02823637062e78779193d6d558225ad94db5b2 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 8 Jul 2025 17:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                |   8 ++
 pages/common/mater-list.vue               |  10 +-
 pages/entry/empty-vehicle-instore.vue     | 144 ++++++++++++++++++++++
 pages/entry/groupplate-instore.vue        |  70 ++++++++---
 pages/entry/mater-group.vue               |  16 +--
 pages/entry/pick-yl-return-store.vue      |  46 ++++---
 pages/home/home.vue                       |  16 +--
 pages/login/login.vue                     |   3 +-
 pages/outbound/ctu-vehicle-outstore.vue   |  31 +++--
 pages/outbound/empty-vehicle-outstore.vue |  36 +++---
 pages/outbound/line-transfer.vue          |  39 +++---
 pages/outbound/mater-outstore.vue         |  62 +++++-----
 pages/outbound/out-store-confirm.vue      |  46 +++++--
 pages/outbound/shelf-bind.vue             |  32 ++---
 utils/getData3.js                         | 109 ++++++++++++++++
 15 files changed, 487 insertions(+), 181 deletions(-)
 create mode 100644 pages/entry/empty-vehicle-instore.vue
 create mode 100644 utils/getData3.js

diff --git a/pages.json b/pages.json
index 9f14894..32be0a3 100644
--- a/pages.json
+++ b/pages.json
@@ -377,6 +377,14 @@
                 "navigationStyle": "custom"
             }
             
+        }
+        ,{
+            "path" : "pages/entry/empty-vehicle-instore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
         }
         ,{
             "path" : "pages/carry/call-carry",
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index 0c2e4b7..e402078 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -58,7 +58,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {groupMaterList} from '@/utils/getData2.js'
+	import {getMaterialList} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -90,10 +90,10 @@
 			searchList () {
 				this.dataList = []
 				this.pageNum = 1
-				this._groupMaterList()
+				this._getMaterialList()
 			},
-			async _groupMaterList () {
-				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+			async _getMaterialList () {
+				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
 				if (res.code === '200') {
 					this.totalCount = res.totalElements
 					if (res.totalElements > 0) {
@@ -114,7 +114,7 @@
 					this.status = 'loading'
 					setTimeout(() => {
 						this.pageNum++
-						this._groupMaterList()
+						this._getMaterialList()
 					}, 1000)
 				} else { //停止加载
 					this.status = 'noMore'
diff --git a/pages/entry/empty-vehicle-instore.vue b/pages/entry/empty-vehicle-instore.vue
new file mode 100644
index 0000000..8a151e4
--- /dev/null
+++ b/pages/entry/empty-vehicle-instore.vue
@@ -0,0 +1,144 @@
+<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="val2"
+						@handleChange="handleChange"
+						/>
+					</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"
+						@handleChange="handleChange"
+						/>
+					</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="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>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_emptyconfirmIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getSect, emptyconfirmIn} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				options: [{text:'托盘', value:'1'},{text:'料箱',value: '2'}],
+				index: '',
+				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options2: [],
+				index2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getSect()
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getReturnMaterial(e)
+				}
+			},
+			async _getSect () {
+				try {
+					let res = await getSect()
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.index = ''
+				this.index2 = ''
+				this.disabled = false
+			},
+			async _emptyconfirmIn () {
+				this.disabled = true
+				if (!this.val1 ||!this.val2 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyconfirmIn(this.val1, this.val2, this.index2, '1', this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue
index cb1bb1d..3376a9e 100644
--- a/pages/entry/groupplate-instore.vue
+++ b/pages/entry/groupplate-instore.vue
@@ -4,6 +4,17 @@
 		<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="val2"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">载具编码</span>
@@ -67,7 +78,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_confirmIn">确认</button>
 		</view>
 	</view>
 </template>
@@ -75,7 +86,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {getSect, getVehicleMaterial, confirmIn} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -85,53 +96,74 @@
 			return {
 				title: '',
 				val1: '',
-				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				val2: '',
+				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options: [],
 				index: '',
 				disabled: false,
-				currentData: {},
-				kwData: {}
+				currentData: {}
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
 		created () {
+			this._getSect()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
+			async _getSect () {
 				try {
-					let res = await getStructCount(e)
+					let res = await getSect()
 					if (res) {
-						this.kwData = res
+						this.options = res
 					} else {
-						this.kwData = {}
+						this.options =[]
 					}
 				} catch (e) {
-					this.kwData = {}
+					this.options = []
 				}
 			},
 			selectChange (e) {
 				this.index = e
 			},
+			handleChange (e) {
+				if (e) {
+					this._getVehicleMaterial(e)
+				}
+			},
+			async _getVehicleMaterial (e) {
+				try {
+					let res = await getVehicleMaterial(this.val1, this.val2, this.index)
+					if (res) {
+						this.currentData = res
+					} else {
+						this.currentData = {}
+					}
+				} catch (e) {
+					this.currentData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this._getVehicleMaterial(e)
+				}
+			},
 			clearUp () {
 				this.val1 = ''
+				this.val2 = ''
 				this.index = ''
 				this.disabled = false
-				this.kwData = {}
+				this.currentData = {}
 			},
-			async _pdaPalletIostorinvIn () {
+			async _confirmIn () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await confirmIn(this.val1, this.val2, this.index)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue
index d495538..93f3379 100644
--- a/pages/entry/mater-group.vue
+++ b/pages/entry/mater-group.vue
@@ -9,7 +9,7 @@
 						<span class="filter_label">源单编码</span>
 					</view>
 					<view class="zd-col-17">
-						<search-box v-model="currentData.yd_code" @handleChange="handleChange" @handleDel="handleDel" />
+						<search-box v-model="val1" @handleChange="handleChange" @handleDel="handleDel" />
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -17,7 +17,7 @@
 						<span class="filter_label">载具编码</span>
 					</view>
 					<view class="zd-col-17">
-						<search-box v-model="currentData.vehicle_code" @handleChange="handleChange" @handleDel="handleDel" />
+						<search-box v-model="val2" @handleChange="handleChange" @handleDel="handleDel" />
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -72,7 +72,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -81,7 +81,8 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {storList, getStructCount, groupMaterIn} from '@/utils/getData2.js'
+	import {storList, getStructCount} from '@/utils/getData2.js'
+	import {groupPlate} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -91,6 +92,8 @@
 		data() {
 			return {
 				title: '',
+				val1: '',
+				val2: '',
 				currentData: {},
 				options: [],
 				index: '',
@@ -100,7 +103,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._storList()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
@@ -175,7 +177,7 @@
 				this.disabled = false
 				this.kwData = {}
 			},
-			async _groupMaterIn () {
+			async _groupPlate () {
 				this.disabled = true
 				if (JSON.stringify(this.currentData) === '{}') {
 					this.disabled = false
@@ -183,7 +185,7 @@
 				}
 				try {
 					this.currentData.stor_code = this.index
-					let res = await groupMaterIn(this.index, this.currentData)
+					let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1)
 					uni.showToast({
 						title: res.msg,
 						icon: 'none'
diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue
index 6f3319c..08caa0e 100644
--- a/pages/entry/pick-yl-return-store.vue
+++ b/pages/entry/pick-yl-return-store.vue
@@ -44,7 +44,7 @@
 						<span class="filter_label filter_input_disabled">物料编号</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -52,7 +52,7 @@
 						<span class="filter_label filter_input_disabled">物料数量</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.qty" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -60,14 +60,14 @@
 						<span class="filter_label filter_input_disabled">物料批次</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.pcsn" disabled>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_confirmReturnMaterial">确认</button>
 		</view>
 	</view>
 </template>
@@ -75,7 +75,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {getSect, getReturnMaterial, confirmReturnMaterial} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -85,34 +85,47 @@
 			return {
 				title: '',
 				val1: '',
-				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options: [],
 				index: '',
 				disabled: false,
-				currentData: {},
-				kwData: {}
+				currentData: {}
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
 		created () {
+			this._getSect()
 		},
 		methods: {
 			handleChange (e) {
 				if (e) {
-					this._getStructCount(e)
+					this._getReturnMaterial(e)
 				}
 			},
-			async _getStructCount (e) {
+			async _getVehicleMaterial (e) {
 				try {
-					let res = await getStructCount(e)
+					let res = await getVehicleMaterial(this.val1, this.index)
 					if (res) {
-						this.kwData = res
+						this.currentData = res
 					} else {
-						this.kwData = {}
+						this.currentData = {}
 					}
 				} catch (e) {
-					this.kwData = {}
+					this.currentData = {}
+				}
+			},
+			async _getSect () {
+				try {
+					let res = await getSect()
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
 				}
 			},
 			selectChange (e) {
@@ -122,16 +135,15 @@
 				this.val1 = ''
 				this.index = ''
 				this.disabled = false
-				this.kwData = {}
 			},
-			async _pdaPalletIostorinvIn () {
+			async _confirmReturnMaterial () {
 				this.disabled = true
 				if (!this.val1 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await confirmReturnMaterial(this.currentData)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d2ffcbe..38ef91a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,13 +41,15 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '物料组盘', path: '/pages/entry/mater-group'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
-					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
-					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
-					{title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
-					{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
-					{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
+					// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-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: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
+					// {title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
+					// {title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
+					// {title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
+					// {title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
+					// {title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
 				],
 				menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
 				show: false,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0ece712..0918463 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -25,7 +25,8 @@
 
 <script>
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
-	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
+	import {pdaUpdate} from '@/utils/getData2.js'
+	import {handLogin} from '@/utils/getData3.js'
 	import UpGrade from './upgrade.vue'
 	export default {
 		components: {
diff --git a/pages/outbound/ctu-vehicle-outstore.vue b/pages/outbound/ctu-vehicle-outstore.vue
index b1dd7ea..1d6ea96 100644
--- a/pages/outbound/ctu-vehicle-outstore.vue
+++ b/pages/outbound/ctu-vehicle-outstore.vue
@@ -32,7 +32,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index|| !val2}" :disabled="disabled" @tap="_vehicleOutConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -40,7 +40,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {getSect, vehicleOutConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -50,8 +50,9 @@
 			return {
 				title: '',
 				val1: '',
-				val2: '',
-				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				val2: '1',
+				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options: [],
 				index: '',
 				disabled: false,
 				currentData: {},
@@ -62,23 +63,19 @@
 			this.title = options.title
 		},
 		created () {
+			this._getSect()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
+			async _getSect () {
 				try {
-					let res = await getStructCount(e)
+					let res = await getSect()
 					if (res) {
-						this.kwData = res
+						this.options = res
 					} else {
-						this.kwData = {}
+						this.options =[]
 					}
 				} catch (e) {
-					this.kwData = {}
+					this.options = []
 				}
 			},
 			selectChange (e) {
@@ -90,14 +87,14 @@
 				this.disabled = false
 				this.kwData = {}
 			},
-			async _pdaPalletIostorinvIn () {
+			async _vehicleOutConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1 || !this.index || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await vehicleOutConfirm(this.index, this.val1, this.val2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/pages/outbound/empty-vehicle-outstore.vue b/pages/outbound/empty-vehicle-outstore.vue
index 1cc852f..f66e4a3 100644
--- a/pages/outbound/empty-vehicle-outstore.vue
+++ b/pages/outbound/empty-vehicle-outstore.vue
@@ -17,14 +17,14 @@
 						<span class="filter_label">目标站点</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input" v-model="val2">
+						<input type="text" class="filter_input" v-model="val1">
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_vehicleOutConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -32,7 +32,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {getSect, vehicleOutConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -41,35 +41,30 @@
 		data() {
 			return {
 				title: '',
-				val2: '',
-				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				val1: '',
+				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options: [],
 				index: '',
-				disabled: false,
-				currentData: {},
-				kwData: {}
+				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
 		created () {
+			this._getSect()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
+			async _getSect () {
 				try {
-					let res = await getStructCount(e)
+					let res = await getSect()
 					if (res) {
-						this.kwData = res
+						this.options = res
 					} else {
-						this.kwData = {}
+						this.options =[]
 					}
 				} catch (e) {
-					this.kwData = {}
+					this.options = []
 				}
 			},
 			selectChange (e) {
@@ -79,16 +74,15 @@
 				this.val1 = ''
 				this.index = ''
 				this.disabled = false
-				this.kwData = {}
 			},
-			async _pdaPalletIostorinvIn () {
+			async _vehicleOutConfirm () {
 				this.disabled = true
 				if (!this.val1 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await vehicleOutConfirm(this.index, this.val1)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/pages/outbound/line-transfer.vue b/pages/outbound/line-transfer.vue
index 7603bd2..9a2c4e2 100644
--- a/pages/outbound/line-transfer.vue
+++ b/pages/outbound/line-transfer.vue
@@ -11,7 +11,6 @@
 					<view class="zd-col-17">
 						<search-box
 						v-model="val1"
-						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -31,19 +30,19 @@
 						<input type="text" class="filter_input" v-model="val2">
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
+				<view class="zd-row border-bottom" v-show="index == '2'">
 					<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>
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_transferConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -51,7 +50,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {getSect, getRegion, transferConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -62,53 +61,55 @@
 				title: '',
 				val1: '',
 				val2: '',
-				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
 				index: '',
+				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options2: [],
+				index2: '',
 				disabled: false,
 				currentData: {},
-				kwData: {}
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
 		created () {
+			this._getRegion()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
+			async _getRegion () {
 				try {
-					let res = await getStructCount(e)
+					let res = await getRegion()
 					if (res) {
-						this.kwData = res
+						this.options2 = res
 					} else {
-						this.kwData = {}
+						this.options2 =[]
 					}
 				} catch (e) {
-					this.kwData = {}
+					this.options2 = []
 				}
 			},
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
 			clearUp () {
 				this.val1 = ''
 				this.index = ''
+				this.index2 = ''
 				this.disabled = false
 				this.kwData = {}
 			},
-			async _pdaPalletIostorinvIn () {
+			async _transferConfirm () {
 				this.disabled = true
 				if (!this.val1 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await transferConfirm(this.val1, this.val2, this.index2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/pages/outbound/mater-outstore.vue b/pages/outbound/mater-outstore.vue
index 6499e20..792e737 100644
--- a/pages/outbound/mater-outstore.vue
+++ b/pages/outbound/mater-outstore.vue
@@ -49,7 +49,7 @@
 		</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': !pkId}" @tap="toSure">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" @tap="_materialConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -57,7 +57,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {outStorageOrder, outStorageOrderList} from '@/utils/getData2.js'
+	import {getMaterialDtl, materialConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,39 +93,24 @@
 			this.id = options.id
 		},
 		created () {
-			this._outStorageOrder()
 		},
 		methods: {
-			/** 下拉框*/
-			async _outStorageOrder () {
-				let res = await outStorageOrder()
-				this.options = [...res]
-			},
-			selectChange (e) {
-				this.index = e
-				if (e) {
-					this.dataList = []
-					this.pageNum = 1
-					this.pkId = ''
-					this._outStorageOrderList(e, this.code)
-				}
-			},
 			handleChange (e) {
 				if (e) {
 					this.dataList = []
 					this.pageNum = 1
 					this.pkId = ''
-					this._outStorageOrderList(this.index, e)
+					this._getMaterialDtl()
 				}
 			},
 			seachList () {
 				this.dataList = []
 				this.pageNum = 1
 				this.pkId = ''
-				this._outStorageOrderList(this.index, this.code)
+				this._getMaterialDtl()
 			},
-			async _outStorageOrderList (index, e) {
-				let res = await outStorageOrderList(this.pageNum + '', this.pageSize + '', index, e)
+			async _getMaterialDtl () {
+				let res = await getMaterialDtl(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
 				if (res.code === '200') {
 					this.totalCount = res.totalElements
 					if (res.totalElements > 0) {
@@ -146,22 +131,39 @@
 					this.status = 'loading'
 					setTimeout(() => {
 						this.pageNum++
-						this._outStorageOrderList(this.index, this.code)
+						this._getMaterialDtl()
 					}, 1000)
 				} else { //停止加载
 					this.status = 'noMore'
 				}
 			},
 			toChek (e) {
-				this.pkId = this.pkId === e.code ? '' : e.code
-				this.pkObj = this.pkId === e.code ? e : {}
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
 			},
-			toSure () {
-				if (this.pkId) {
-					this.$store.dispatch('setPublicObj', this.pkObj)
-					uni.navigateTo({
-						url: '/pages/outbound/bill-out-store?title=单据出库'
-					})
+			async _materialConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await materialConfirm(this.pkId, this.pkObj.storagevehicle_code, this.val1, this.val2)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
 				}
 			}
 		}
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index 4d2085f..f18c2a1 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -10,7 +10,8 @@
 					</view>
 					<view class="zd-col-24">
 						<search-box
-						v-model="code"
+						v-model="val1"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -35,7 +36,7 @@
 						<span class="filter_label filter_input_disabled">物料编号</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -43,7 +44,7 @@
 						<span class="filter_label filter_input_disabled">物料批次</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.pcsn" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -51,7 +52,7 @@
 						<span class="filter_label filter_input_disabled">物料数量</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.qty" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -59,15 +60,15 @@
 						<span class="filter_label filter_input_disabled">出库数量</span>
 					</view>
 					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input filter_input_disabled" :class="{'hightlight': isDiff === false}" v-model="currentData.frozen_qty" disabled>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">强制确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">出库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_confirm('2')">强制确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_confirm('1')">出库确认</button>
 		</view>
 	</view>
 </template>
@@ -75,7 +76,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {ioStorageOut} from '@/utils/getData2.js'
+	import {iosOutgetVehicleMaterial, confirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -83,9 +84,10 @@
 		},
 		data() {
 			return {
-				code: '',
+				val1: '',
 				currentData: {},
-				disabled: false
+				disabled: false,
+				isDiff: false,
 			};
 		},
 		onLoad (options) {
@@ -98,14 +100,31 @@
 				this.code = ''
 				this.disabled = false
 			},
-			async _ioStorageOut () {
+			handleChange (e) {
+				if (e) {
+					this._iosOutgetVehicleMaterial(e)
+				}
+			},
+			async _iosOutgetVehicleMaterial (e) {
+				try {
+					let res = await iosOutgetVehicleMaterial(e)
+					if (res) {
+						this.currentData = res
+					} else {
+						this.currentData = {}
+					}
+				} catch (e) {
+					this.currentData = {}
+				}
+			},
+			async _confirm (type) {
 				this.disabled = true
 				if (!this.code) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await ioStorageOut(this.code)
+					let res = await confirm(this.currentData.group_id, this.val1, type)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
@@ -128,5 +147,6 @@
 </script>
 
 <style lang="stylus">
-
+.hightlight
+	color #f00
 </style>
diff --git a/pages/outbound/shelf-bind.vue b/pages/outbound/shelf-bind.vue
index ffa5b4a..74fc8d4 100644
--- a/pages/outbound/shelf-bind.vue
+++ b/pages/outbound/shelf-bind.vue
@@ -11,7 +11,6 @@
 					<view class="zd-col-17">
 						<search-box
 						v-model="val1"
-						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -30,8 +29,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">绑定</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">解绑</button>
+			<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>
@@ -39,7 +38,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	import {bindOrUnbind} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -51,7 +50,6 @@
 				val1: '',
 				val2: '',
 				disabled: false,
-				kwData: {}
 			};
 		},
 		onLoad (options) {
@@ -60,35 +58,19 @@
 		created () {
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
-				try {
-					let res = await getStructCount(e)
-					if (res) {
-						this.kwData = res
-					} else {
-						this.kwData = {}
-					}
-				} catch (e) {
-					this.kwData = {}
-				}
-			},
 			clearUp () {
 				this.val1 = ''
+				this.val2 = ''
 				this.disabled = false
 			},
-			async _pdaPalletIostorinvIn () {
+			async _bindOrUnbind (type) {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					let res = await bindOrUnbind(this.val1, this.val2, type)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/utils/getData3.js b/utils/getData3.js
new file mode 100644
index 0000000..9c020fe
--- /dev/null
+++ b/utils/getData3.js
@@ -0,0 +1,109 @@
+import request from './request.js'
+
+// 版本更新测试
+export const pdaUpdate = () => request({
+	url:'api/pda/update'
+})
+// export const pdaUpdate = () => {
+// 	let res = {
+// 		versionName: '1.0.1',
+// 		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+// 	}
+// 	return res
+// }
+
+// 登录
+export const handLogin = (user, password) => request({
+	url:'mobile/auth/login',
+	data: {
+		username: user,
+		password: password
+	}
+})
+
+// 公共接口
+// 仓库列表/区域列表
+export const getSect = (page, size) => request({
+	url:'api/pda/iosIn/getSect',
+	data: {page: page, size: size}
+})
+// 区域列表
+export const getRegion = (page, size) => request({
+	url:'api/pda/iosIn/getRegion',
+	data: {page: page, size: size}
+})
+// 获取物料列表
+export const getMaterialList = (search, page, size) => request({
+	url:'api/pda/iosIn/getMaterialList',
+	data: {search: search, page: page, size: size}
+})
+
+
+// 入库管理
+// 物料组盘确认
+export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({
+	url:'api/pda/iosIn/groupPlate',
+	data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode}
+})
+// 组盘入库确认
+export const confirmIn = (vcode, sitecode, sid) => request({
+	url:'api/pda/iosIn/confirmIn',
+	data: {vehicle_code: vcode,  site_code: sitecode, sect_id: sid}
+})
+// 空载具入库确认
+export const emptyconfirmIn = (vcode, sitecode, sid, isempty, type) => request({
+	url:'api/pda/iosIn/confirmIn',
+	data: {vehicle_code: vcode, site_code: sitecode, sect_id: sid, is_empty_vehicle: isempty, material_id: type}
+})
+// 组盘入库获取物料明细
+export const getVehicleMaterial = (search) => request({
+	url:'api/pda/iosIn/getVehicleMaterial',
+	data: {search: search}
+})
+// 拣选余料回库查询
+export const getReturnMaterial = (search) => request({
+	url:'api/pda/iosIn/getReturnMaterial',
+	data: {search: search}
+})
+// 拣选余料回库确认
+export const confirmReturnMaterial = (gid, code, sid) => request({
+	url:'api/pda/iosIn/confirmReturnMaterial',
+	data: {group_id: gid, vehicle_code: code, sect_id: sid}
+})
+
+// 出库管理
+// 物料出库获取物料库存
+export const getMaterialDtl = (search) => request({
+	url:'api/pda/iosOut/getMaterialDtl',
+	data: {search: search}
+})
+// 物料出库确认
+export const materialConfirm = (gid, scode, siteCode, strcode) => request({
+	url:'api/pda/iosOut/materialConfirm',
+	data: {group_id: gid, storagevehicle_code: scode, siteCode: siteCode, struct_code: strcode}
+})
+// 出库确认获取物料明细
+export const iosOutgetVehicleMaterial = (search) => request({
+	url:'api/pda/iosOut/getVehicleMaterial',
+	data: {search: search}
+})
+// 出库确认
+export const confirm = (gid, scode, type) => request({
+	url:'api/pda/iosOut/confirm',
+	data: {group_id: gid, storagevehicle_code: scode, type: type}
+})
+// 货架绑定/解绑
+export const bindOrUnbind = (siteCode, shelfCode, mode) => request({
+	url:'api/pda/iosOut/bindOrUnbind',
+	data: {siteCode: siteCode, shelfCode: shelfCode, mode: mode}
+})
+// 转运确认
+export const transferConfirm = (scode, siteCode, rcode) => request({
+	url:'api/pda/iosOut/transferConfirm',
+	data: {storagevehicle_code: scode, siteCode: siteCode, region_code: rcode}
+})
+// 空载具/CTU出库确认
+export const vehicleOutConfirm = (sid, siteCode, qty) => request({
+	url:'api/pda/iosOut/vehicleOutConfirm',
+	data: {sect_id: sid, siteCode: siteCode, qty: qty}
+})