From 3a43e50e155e88512ac3d97d3757a49d0826043b Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 21 Aug 2025 14:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue             |  2 +-
 pages/zw/confirm-quhuo.vue      | 97 +++++++++++++++++++++++++++++++++
 pages/zw/kzj-instore.vue        | 35 ++++++++++--
 pages/zw/kzj-outstore.vue       |  2 +-
 pages/zw/ll-instore.vue         | 49 +++++++++++++----
 pages/zw/manual-callmater.vue   | 71 ++++++++++++++++--------
 pages/zw/manual-returnmater.vue | 63 ++++++++++++++++-----
 pages/zw/wl-groupplate.vue      | 38 +++++++++++--
 utils/getData4.js               | 50 +++++++++++++----
 9 files changed, 341 insertions(+), 66 deletions(-)
 create mode 100644 pages/zw/confirm-quhuo.vue

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9736534..a221285 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,7 +43,7 @@
 				menuList: [
 					{title: '解包管理', path: 'RF03', 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: '/pages/zw/mancar-safe'}]},
 					{title: '原料管理', path: 'RF04', sonTree: [{title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}, {title: '物料组盘', path: '/pages/zw/wl-groupplate'}]},
-					{title: '产线管理', path: 'RF07', sonTree: [{title: '人工叫料', path: '/pages/zw/manual-callmater'}, {title: '人工退料', path: '/pages/zw/manual-returnmater'}]},
+					{title: '产线管理', path: 'RF07', sonTree: [{title: '手工叫料', path: '/pages/zw/manual-callmater'}, {title: '手工退料', path: '/pages/zw/manual-returnmater'}]},
 					// {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/confirm-quhuo.vue b/pages/zw/confirm-quhuo.vue
new file mode 100644
index 0000000..ca31c23
--- /dev/null
+++ b/pages/zw/confirm-quhuo.vue
@@ -0,0 +1,97 @@
+<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-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></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="_pickUp">确认设置</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pickUp} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{text:'空点位', value:'1'}, {text:'空托盘', value: '2'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			},
+			async _pickUp () {
+				this.disabled = true
+				if (!this.index || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pickUp(this.val1, this.index)
+					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>
diff --git a/pages/zw/kzj-instore.vue b/pages/zw/kzj-instore.vue
index 01e8e67..4f87d43 100644
--- a/pages/zw/kzj-instore.vue
+++ b/pages/zw/kzj-instore.vue
@@ -11,6 +11,17 @@
 					<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-17">
+						<search-box
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -26,7 +37,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="_vehicleInConfirm">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_vehicleInConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -34,7 +45,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getPdaSect, vehicleInConfirm} from '@/utils/getData4.js'
+	import {getPdaSect, getPointCodeByVehicleCode, vehicleInConfirm} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -44,6 +55,7 @@
 			return {
 				title: '',
 				val1: '',
+				val2: '',
 				options: [],
 				index: '',
 				disabled: false
@@ -56,6 +68,11 @@
 			this._getPdaSect()
 		},
 		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getPointCodeByVehicleCode()
+				}
+			},
 			async _getPdaSect () {
 				try {
 					let res = await getPdaSect()
@@ -76,14 +93,24 @@
 				this.index = ''
 				this.disabled = false
 			},
+			async _getPointCodeByVehicleCode () {
+				try {
+					let res = await getPointCodeByVehicleCode(this.val1)
+					if (res.code === '200') {
+						this.val2 = res.data
+					} else {
+					}
+				} catch (e) {
+				}
+			},
 			async _vehicleInConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await vehicleInConfirm(this.val1, this.index)
+					let res = await vehicleInConfirm(this.val1, this.index, this.val2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/zw/kzj-outstore.vue b/pages/zw/kzj-outstore.vue
index 2272895..992bc6c 100644
--- a/pages/zw/kzj-outstore.vue
+++ b/pages/zw/kzj-outstore.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 空托盘入库 -->
+		<!-- 空托盘出库 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
diff --git a/pages/zw/ll-instore.vue b/pages/zw/ll-instore.vue
index 33a3086..2069941 100644
--- a/pages/zw/ll-instore.vue
+++ b/pages/zw/ll-instore.vue
@@ -4,6 +4,14 @@
 		<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="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>
@@ -12,14 +20,6 @@
 						<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-17">
-						<search-box v-model="val1"/>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">点位码</span>
@@ -27,6 +27,16 @@
 					<view class="zd-col-17">
 						<search-box
 						v-model="val2"
+						/>
+					</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>
@@ -113,7 +123,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getFormDataList, getPlate, zwConfirmIn} from '@/utils/getData4.js'
+	import {getFormDataList, getPlate, inCheck, zwConfirmIn} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -124,6 +134,8 @@
 				title: '',
 				options: [],
 				index: '',
+				options2: [{text:'当天', value: '1'}, {text:'前一天', value: '2'}],
+				index2: '',
 				id: '',
 				code: '',
 				val1: '',
@@ -146,7 +158,7 @@
 		methods: {
 			handleChange (e) {
 				if (e) {
-					this.handleAdd()
+					this.inCheck()
 				}
 			},
 			handleAdd () {
@@ -195,6 +207,9 @@
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
 			// toChek (e) {
 			// 	this.pkId = this.pkId === e.vid ? '' : e.vid
 			// 	this.pkObj = this.pkId === e.vid ? e : {}
@@ -207,6 +222,20 @@
 				this.dataList = []
 				this.checkedArr = []
 			},
+			async _inCheck () {
+				try {
+					let res = await inCheck()
+					if (res.code === '200') {
+						this.handleAdd()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+				}
+			},
 			async _zwConfirmIn () {
 				this.disabled = true
 				if (!this.index || !this.dataList.length) {
diff --git a/pages/zw/manual-callmater.vue b/pages/zw/manual-callmater.vue
index 873e19a..760f57c 100644
--- a/pages/zw/manual-callmater.vue
+++ b/pages/zw/manual-callmater.vue
@@ -4,6 +4,14 @@
 		<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>
@@ -14,20 +22,12 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">库区起点</span>
+						<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 class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">物料信息</span>
@@ -60,6 +60,22 @@
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-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.supp_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-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.supp_name" disabled>
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">任务类型</span>
@@ -80,7 +96,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getPdaSect, getPdaStruct, checkoutbillcallMaterial} from '@/utils/getData4.js'
+	import {getPdaSect, getPdaVehicleCodeBySectCode, getMaterialSuppByVehicleCode, checkoutbillcallMaterial} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -104,20 +120,14 @@
 			this.title = options.title
 		},
 		onShow() {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData = this.$store.getters.publicObj
-				this.$store.dispatch('setPublicObj', '')
-			}
 		},
 		created () {
 			this._getPdaSect()
-			this._getPdaStruct(e)
+			this._getPdaVehicleCodeBySectCode()
 		},
 		methods: {
 			toJump () {
-				uni.navigateTo({
-					url: '/pages/common/mater-list?title=查询物料'
-				})
+				this._getMaterialSuppByVehicleCode()
 			},
 			async _getPdaSect () {
 				try {
@@ -131,9 +141,9 @@
 					this.options = []
 				}
 			},
-			async _getPdaStruct (e) {
+			async _getPdaVehicleCodeBySectCode () {
 				try {
-					let res = await getPdaStruct(this.index)
+					let res = await getPdaVehicleCodeBySectCode(this.index)
 					if (res) {
 						this.options2 = res.data
 					} else {
@@ -143,9 +153,23 @@
 					this.options2 = []
 				}
 			},
+			async _getMaterialSuppByVehicleCode () {
+				try {
+					let res = await getMaterialSuppByVehicleCode(this.index2)
+					if (res.code === '200') {
+						this.currentData = res.data
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+				}
+			},
 			selectChange (e) {
 				this.index = e
-				this._getPdaStruct(e)
+				this._getPdaVehicleCodeBySectCode(e)
 			},
 			selectChange2 (e) {
 				this.index2 = e
@@ -155,6 +179,9 @@
 			},
 			clearUp () {
 				this.index = ''
+				this.index2 = ''
+				this.val1 = ''
+				this.currentData = {}
 				this.disabled = false
 			},
 			async _checkoutbillcallMaterial () {
@@ -164,7 +191,7 @@
 					return
 				}
 				try {
-					let res = await checkoutbillcallMaterial(this.val1, this.index2, this.currentData.material_code, this.index4)
+					let res = await checkoutbillcallMaterial(this.val1, this.index2, this.currentData.material_code, this.index4, this.currentData.supp_code, this.currentData.supp_name)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue
index c066015..437654a 100644
--- a/pages/zw/manual-returnmater.vue
+++ b/pages/zw/manual-returnmater.vue
@@ -28,6 +28,14 @@
 						<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></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="index5" :localdata="options5" @change="selectChange5"></uni-data-select>
+					</view>
+				</view>
 			<view v-if="index4 === '1'">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
@@ -78,8 +86,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button v-show="index4 === '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4 || !val3 || !currentData.material_code}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
-			<button v-show="index4 !== '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
+			<button v-show="index4 === '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4 || !index5 || !val3 || !currentData.material_code}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
+			<button v-show="index4 !== '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4 || !index5}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
 		</view>
 	</view>
 </template>
@@ -88,7 +96,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {checkoutbillBackMaterial} from '@/utils/getData4.js'
+	import {suppList, getMaterialSuppByVehicleCode, checkoutbillBackMaterial} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -103,6 +111,8 @@
 				title: '',
 				options4: [{text:'退料', value:'1'}, {text:'退空桶', value: '2'}],
 				index4: '',
+				options5: [],
+				index5: '',
 				currentData: {},
 				disabled: false
 			};
@@ -111,43 +121,70 @@
 			this.title = options.title
 		},
 		onShow() {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData = this.$store.getters.publicObj
-				this.$store.dispatch('setPublicObj', '')
-			}
 		},
 		created () {
+			this._suppList()
 		},
 		methods: {
+			async _suppList () {
+				try {
+					let res = await suppList()
+					if (res) {
+						this.options5 = res.data
+					} else {
+						this.options5 = []
+					}
+				} catch (e) {
+					this.options5 = []
+				}
+			},
 			toJump () {
-				uni.navigateTo({
-					url: '/pages/common/mater-list?title=查询物料'
-				})
+				this.getMaterialSuppByVehicleCode()
 			},
 			selectChange4 (e) {
 				this.index4 = e
 			},
+			selectChange5 (e) {
+				this.index5 = e
+			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
 				this.index4 = ''
+				this.index5 = ''
+				this.currentData = {}
 				this.disabled = false
 			},
+			async _getMaterialSuppByVehicleCode () {
+				try {
+					let res = await getMaterialSuppByVehicleCode(this.index2)
+					if (res.code === '200') {
+						this.currentData = res.data
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+				}
+			},
 			async _checkoutbillBackMaterial () {
 				this.disabled = true
 				if (this.index4 === '1') {
-					if (!this.val1 || !this.val2 || !this.index4 || !this.val3 || !this.currentData.material_code) {
+					if (!this.val1 || !this.val2 || !this.index4 || !this.index5 || !this.val3 || !this.currentData.material_code) {
 						this.disabled = false
 						return
 					}
 				} else {
-					if (!this.val1 || !this.val2 || !this.index4) {
+					if (!this.val1 || !this.val2 || !this.index4 || !this.index5) {
 						this.disabled = false
 						return
 					}
 				}
 				try {
-					let res = await checkoutbillBackMaterial(this.val1, this.val2, this.index4, this.val3, this.currentData.material_code)
+					let selobj = this.options5.find(item => item.value === this.index5)
+					let res = await checkoutbillBackMaterial(this.val1, this.val2, this.index4, this.val3, this.currentData.material_code, this.index5, selobj.text)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/zw/wl-groupplate.vue b/pages/zw/wl-groupplate.vue
index cffa8b6..2cac6e2 100644
--- a/pages/zw/wl-groupplate.vue
+++ b/pages/zw/wl-groupplate.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 空托盘入库 -->
+		<!-- 物料组盘 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -62,11 +62,19 @@
 						<NumberInput v-model="currentData.qty" />
 					</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': JSON.stringify(currentData) === '{}' || !val1 || !index}" :disabled="disabled" @tap="_zwgroupPlate">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !val1 || !index || !index2}" :disabled="disabled" @tap="_zwgroupPlate">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -75,7 +83,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {getFormDataList, getFormMaterial, zwgroupPlate} from '@/utils/getData4.js'
+	import {getFormDataList, getFormMaterial, supplierdroplist, zwgroupPlate} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -89,6 +97,8 @@
 				currentData: {},
 				options: [],
 				index: '',
+				options2: [],
+				index2: '',
 				disabled: false
 			};
 		},
@@ -97,6 +107,7 @@
 		},
 		created () {
 			this._getFormDataList()
+			this._supplierdroplist()
 		},
 		methods: {
 			toJump () {
@@ -114,6 +125,18 @@
 					this.options = []
 				}
 			},
+			async _supplierdroplist () {
+				try {
+					let res = await supplierdroplist()
+					if (res) {
+						this.options2 = res.data
+					} else {
+						this.options2 = []
+					}
+				} catch (e) {
+					this.options2 = []
+				}
+			},
 			async _getFormMaterial () {
 				try {
 					let res = await getFormMaterial(this.index)
@@ -132,21 +155,26 @@
 					this._getFormMaterial()
 				}
 			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
 			clearUp () {
 				this.val1 = ''
 				this.index = ''
+				this.index2 = ''
 				this.currentData = {}
 				this.disabled = false
 			},
 			async _zwgroupPlate () {
 				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}' || !this.val1 || !this.index) {
+				if (JSON.stringify(this.currentData) === '{}' || !this.val1 || !this.index || !this.index2) {
 					this.disabled = false
 					return
 				}
 				try {
 					this.currentData.stor_code = this.index
-					let res = await zwgroupPlate(this.val1, this.currentData.material_id, this.currentData.qty, this.index)
+					let selobj = this.options2.find(item => item.value === this.index2)
+					let res = await zwgroupPlate(this.val1, this.currentData.material_id, this.currentData.qty, this.index, this.index2, selobj.text)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/utils/getData4.js b/utils/getData4.js
index f681da4..7d9eb46 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -227,6 +227,11 @@ export const getPlate = (vcode) => request({
 	url:'api/pda/iosIn/getPlate',
 	data: {vehicle_code: vcode}
 })
+// PDA来料入库校验点位和托盘码
+export const inCheck = () => request({
+	url:'api/pda/iosIn/inCheck',
+	data: {}
+})
 
 // 空载具出入库
 // 载具编码下拉框
@@ -235,33 +240,47 @@ export const getPdaSect = (scode, page, size) => request({
 	data: {stor_code: scode, page: page, size: size}
 })
 // 空载具入库
-export const vehicleInConfirm = (vcode, sectcode) => request({
+export const vehicleInConfirm = (vcode, sectcode, pcode) => request({
 	url:'api/pda/iosIn/vehicleInConfirm',
-	data: {vehicle_code: vcode, sect_code: sectcode}
+	data: {vehicle_code: vcode, sect_code: sectcode, point_code: pcode}
 })
 // 空载具出库
 export const iosOutvehicleOutConfirm = (sid, siteCode) => request({
 	url:'api/pda/iosOut/vehicleOutConfirm',
 	data: {sect_id: sid, siteCode: siteCode}
 })
+// 通过载具编码获取点位
+export const getPointCodeByVehicleCode = (vcode) => request({
+	url:'api/pda/iosIn/getPointCodeByVehicleCode',
+	data: {vehicle_code: vcode}
+})
 
 // 手工叫料/退料
 // 手工叫料
-export const checkoutbillcallMaterial = (dcode, scode, mcode, type) => request({
+export const checkoutbillcallMaterial = (dcode, scode, mcode, type, spcode, spname) => request({
 	url:'api/checkoutbill/callMaterial',
-	data: {device_code: dcode, struct_code: scode, material_code: mcode, task_type: type}
+	data: {device_code: dcode, struct_code: scode, material_code: mcode, task_type: type, supp_code: spcode, supp_name: spname}
 })
 // 手工退料
-export const checkoutbillBackMaterial = (dcode, vcode, type, qty, mcode) => request({
+export const checkoutbillBackMaterial = (dcode, vcode, type, qty, mcode, spcode, spname) => request({
 	url:'api/checkoutbill/BackMaterial',
-	data: {device_code: dcode, vehicle_code: vcode, task_type: type, qty: qty, material_code: mcode}
+	data: {device_code: dcode, vehicle_code: vcode, task_type: type, qty: qty, material_code: mcode, supp_code: spcode, supp_name: spname}
 })
-// 获取库位
+// 获取库位(已弃用)
 export const getPdaStruct = (scode) => request({
 	url:'api/pda/iosIn/getPdaStruct',
 	data: {sect_code: scode}
 })
-
+// 根据库区获得料桶号列表
+export const getPdaVehicleCodeBySectCode = (scode) => request({
+	url:'api/pda/iosOut/getPdaVehicleCodeBySectCode',
+	data: {sect_code: scode}
+})
+// 根据料桶号获得物料、供应商详情
+export const getMaterialSuppByVehicleCode = (vcode) => request({
+	url:'api/pda/iosOut/getMaterialSuppByVehicleCode',
+	data: {vehicle_code: vcode}
+})
 // 点位属性设置
 export const updatePointType = (code, type) => request({
 	url:'api/schBasePoint/updatePointType',
@@ -270,9 +289,9 @@ export const updatePointType = (code, type) => request({
 
 // 组盘入库
 // 物料组盘（带单据）
-export const zwgroupPlate = (vcode, mid, qty, ecode) => request({
+export const zwgroupPlate = (vcode, mid, qty, ecode, spcode, spname) => request({
 	url:'api/pda/iosIn/groupPlate',
-	data: {vehicle_code: vcode, material_id: mid, qty: qty, ext_code: ecode}
+	data: {vehicle_code: vcode, material_id: mid, qty: qty, ext_code: ecode, supp_code: spcode, supp_name: spname}
 })
 // 获取单据下拉清单
 // export const getFormDataList = (fdcode) => request({
@@ -284,9 +303,20 @@ export const getFormMaterial = (ecode) => request({
 	url:'api/pda/iosIn/getFormMaterial',
 	data: {ext_code: ecode}
 })
+// 获取供应商
+export const supplierdroplist = () => request({
+	url:'api/pda/iosIn/supplier-drop-list',
+	data: {}
+})
 
 // 物料组盘入库
 export const combination = (vcode, pcsn, mid, spcode, spname, sweight) => request({
 	url:'api/pda/jb/combination',
 	data: {vehicle_code: vcode, pcsn: pcsn, material_id: mid, supp_code: spcode, supp_name: spname, single_weight: sweight}
 })
+
+// 确认取货
+export const pickUp = () => request({
+	url:'api/pda/iosOut/pickUp',
+	data: {}
+})