jiekou

2025-07-09 15:09:07 +08:00
parent 10d36c78b6
commit c4d815cef1
35 changed files with 342 additions and 161 deletions
--- a/pages.json
+++ b/pages.json
@@ -305,6 +305,14 @@
                "navigationStyle": "custom"
            }
            
+        }
+        ,{
+            "path" : "pages/outbound/line-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
        }
        ,{
            "path" : "pages/outbound/shelf-bind",
--- a/pages/carry/call-carry.vue
+++ b/pages/carry/call-carry.vue
@@ -84,7 +84,7 @@
 					let res = await transfConfirm(this.val1, this.index, this.val2)
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/check/check-task.vue
+++ b/pages/check/check-task.vue
@@ -148,13 +148,13 @@
 					let res = await checkSaveCheckTask(this.data.children_id, this.data.children_vehicle_code, this.data.check_qty, this.data.children_qty)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -95,18 +95,19 @@
 			async _getMaterialList () {
 				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
 				if (res.code === '200') {
-					this.totalCount = res.totalElements
-					if (res.totalElements > 0) {
-						const dataMap = res.content
-						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-						this.reload = false
-					} else {
-						this.dataList = []
-					}
-					if (this.totalCount == this.dataList.length) {
-						this.reload = false
-						this.status = 'noMore'
-					}
+					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 () {
--- a/pages/entry/bill-to-store.vue
+++ b/pages/entry/bill-to-store.vue
@@ -326,7 +326,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/entry/check-to-store.vue
+++ b/pages/entry/check-to-store.vue
@@ -228,7 +228,7 @@
 					let obj = Object.assign(this.currentData, {single_weight: this.sWeight, pcsn: this.pcsn, qty: this.qty})
 					let res = await checkMaterConfirm(obj)
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 					this.disabled = false
--- a/pages/entry/empty-tray-to-store.vue
+++ b/pages/entry/empty-tray-to-store.vue
@@ -116,13 +116,13 @@
 					let res = await pdaPalletIostorinvIn(this.val1, this.index)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/entry/empty-vehicle-instore.vue
+++ b/pages/entry/empty-vehicle-instore.vue
@@ -120,13 +120,13 @@
 					let res = await emptyconfirmIn(this.val1, this.val2, this.index2, '1', this.index)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/entry/group-to-store.vue
+++ b/pages/entry/group-to-store.vue
@@ -143,7 +143,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/entry/groupplate-instore.vue
+++ b/pages/entry/groupplate-instore.vue
@@ -160,13 +160,13 @@
 					let res = await confirmIn(this.val1, this.val2, this.index)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -217,7 +217,7 @@
 					this.currentData.stor_code = this.index
 					let res = await groupMaterIn(this.index, this.currentData)
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 					this.disabled = false
--- 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="val1" @handleChange="handleChange" @handleDel="handleDel" />
+						<search-box v-model="val1"/>
 					</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="val2" @handleChange="handleChange" @handleDel="handleDel" />
+						<search-box v-model="val2"/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -49,7 +49,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">
@@ -81,7 +81,6 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {storList, getStructCount} from '@/utils/getData2.js'
 	import {groupPlate} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -97,85 +96,27 @@
 				currentData: {},
 				options: [],
 				index: '',
-				disabled: false,
-				kwData: {}
+				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
-		onShow () {
+		onShow() {
 			if (this.$store.getters.publicObj !== '') {
 				this.currentData = this.$store.getters.publicObj
-				if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) {
-					this.options.map(el => {
-						if (el.value === this.currentData.stor_code) {
-							this.index = el.value
-						}
-					})
-				} else {
-					if (this.currentData.vehicle_code && this.currentData.vehicle_code.charAt(0).toUpperCase() === 'T') {
-						this.index ='FStockPallet'
-					} else {
-						this.index ='FStockId'
-					}
-				}
-				if (this.currentData.vehicle_code) {
-					this._getStructCount(this.currentData.vehicle_code)
-				} else {
-					this.kwData = {}
-				}
-				this.$store.dispatch('setPublicObj', '')
 			}
 		},
 		methods: {
-			selectChange (e) {
-				this.index = e
-			},
-			async _storList () {
-				let res = await storList()
-				if (res.code === '200') {
-					this.options = [...res.content]
-					this.options.map(el => {
-						this.$set(el, 'text', el.label)
-					})
-				}
-			},
 			toJump () {
 				uni.navigateTo({
 					url: '/pages/common/mater-list?title=查询物料'
 				})
 			},
-			handleChange (e) {
-				if (e) {
-					if (e.charAt(0).toUpperCase() === 'T') {
-						this.index ='FStockPallet'
-					} else {
-						this.index ='FStockId'
-					}
-					this._getStructCount(e)
-				}
-			},
-			async _getStructCount (e) {
-				try {
-					let res = await getStructCount(e)
-					if (res) {
-						this.kwData = res
-					} else {
-						this.kwData = {}
-					}
-				} catch (e) {
-					this.kwData = {}
-				}
-			},
-			handleDel () {
-				this.index = ''
-			},
 			toEmpty () {
 				this.currentData = {}
 				this.index = ''
 				this.disabled = false
-				this.kwData = {}
 			},
 			async _groupPlate () {
 				this.disabled = true
@@ -187,7 +128,7 @@
 					this.currentData.stor_code = this.index
 					let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1)
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 					this.disabled = false
--- a/pages/entry/pick-yl-return-store.vue
+++ b/pages/entry/pick-yl-return-store.vue
@@ -104,9 +104,9 @@
 					this._getReturnMaterial(e)
 				}
 			},
-			async _getVehicleMaterial (e) {
+			async _getReturnMaterial (e) {
 				try {
-					let res = await getVehicleMaterial(this.val1, this.index)
+					let res = await getReturnMaterial(this.val1)
 					if (res) {
 						this.currentData = res
 					} else {
@@ -146,13 +146,13 @@
 					let res = await confirmReturnMaterial(this.currentData)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/entry/qualified-to-store.vue
+++ b/pages/entry/qualified-to-store.vue
@@ -203,7 +203,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{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'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {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'}]},
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -103,7 +103,7 @@
 						})
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 					}
--- a/pages/mode/command.vue
+++ b/pages/mode/command.vue
@@ -75,7 +75,7 @@
 					let res = await toCommandTP(this.val1, '1', this.val2, check)
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/mode/pick.vue
+++ b/pages/mode/pick.vue
@@ -66,7 +66,7 @@
 					let res = await pinkStartStop(this.val1, this.index)
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/mode/switch-in-out.vue
+++ b/pages/mode/switch-in-out.vue
@@ -66,7 +66,7 @@
 					let res = await switchInOut(this.val1, this.index)
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/bill-out-store.vue
+++ b/pages/outbound/bill-out-store.vue
@@ -161,7 +161,7 @@
 						}
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 					}
@@ -207,14 +207,14 @@
 					let res = await outStorageConfirm(obj)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.toEmpty()
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/ctu-vehicle-outstore.vue
+++ b/pages/outbound/ctu-vehicle-outstore.vue
@@ -97,13 +97,13 @@
 					let res = await vehicleOutConfirm(this.index, this.val1, this.val2)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/empty-vehicle-outstore.vue
+++ b/pages/outbound/empty-vehicle-outstore.vue
@@ -85,13 +85,13 @@
 					let res = await vehicleOutConfirm(this.index, this.val1)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/line-callmater.vue
+++ b/pages/outbound/line-callmater.vue
@@ -0,0 +1,196 @@
+<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 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="val2" @blur="handleChange">
+					</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>
+							</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.material_code}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty_unit_name}}</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': !pkId}" @tap="_materialConfirm">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getRegion, linegetMaterialDtl, materialConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				id: '',
+				code: '',
+				val1: '',
+				val2: '',
+				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()
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (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, this.val2)
+				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 _materialConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await materialConfirm(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>
--- a/pages/outbound/line-transfer.vue
+++ b/pages/outbound/line-transfer.vue
@@ -112,13 +112,13 @@
 					let res = await transferConfirm(this.val1, this.val2, this.index2)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/mater-outstore.vue
+++ b/pages/outbound/mater-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">
@@ -9,7 +9,15 @@
 						<span class="filter_label">产线站点号</span>
 					</view>
 					<view class="zd-col-17">
-						<search-box v-model="val1" @handleChange="handleChange" />
+						<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 class="zd-row border-bottom">
@@ -17,7 +25,7 @@
 						<span class="filter_label">库存信息</span>
 					</view>
 					<view class="zd-col-17">
-						<search-box v-model="val2" @handleChange="handleChange" />
+						<input type="text" class="filter_input" v-model="val2" @blur="handleChange">
 					</view>
 				</view>
 			</view>
@@ -34,12 +42,12 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.code}">
-								<td>{{e.code}}</td>
-								<td>{{e.form_type}}</td>
-								<td>{{e.remark}}</td>
+							<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.material_code}}</td>
+								<td>{{e.qty}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.unit_name}}</td>
+								<td>{{e.qty_unit_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -57,7 +65,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getMaterialDtl, materialConfirm} from '@/utils/getData3.js'
+	import {getSect, getMaterialDtl, materialConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,8 +101,24 @@
 			this.id = options.id
 		},
 		created () {
+			this._getSect()
 		},
 		methods: {
+			async _getSect () {
+				try {
+					let res = await getSect()
+					if (res) {
+						this.options = res
+					} else {
+						this.options =[]
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
 			handleChange (e) {
 				if (e) {
 					this.dataList = []
@@ -110,20 +134,21 @@
 				this._getMaterialDtl()
 			},
 			async _getMaterialDtl () {
-				let res = await getMaterialDtl(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
+				let res = await getMaterialDtl(this.index, this.val2)
 				if (res.code === '200') {
-					this.totalCount = res.totalElements
-					if (res.totalElements > 0) {
-						const dataMap = res.content
-						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-						this.reload = false
-					} else {
-						this.dataList = []
-					}
-					if (this.totalCount == this.dataList.length) {
-						this.reload = false
-						this.status = 'noMore'
-					}
+					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 () {
@@ -148,16 +173,16 @@
 					return
 				}
 				try {
-					let res = await materialConfirm(this.pkId, this.pkObj.storagevehicle_code, this.val1, this.val2)
+					let res = await materialConfirm(this.index, this.val1, this.pkObj)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -108,8 +108,8 @@
 			async _iosOutgetVehicleMaterial (e) {
 				try {
 					let res = await iosOutgetVehicleMaterial(e)
-					if (res) {
-						this.currentData = res
+					if (res.code === '200') {
+						this.currentData = res.data[0]
 					} else {
 						this.currentData = {}
 					}
@@ -127,13 +127,13 @@
 					let res = await confirm(this.currentData.group_id, this.val1, type)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/pick-confirm-2nd.vue
+++ b/pages/outbound/pick-confirm-2nd.vue
@@ -87,7 +87,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/produce-out-store-2nd.vue
+++ b/pages/outbound/produce-out-store-2nd.vue
@@ -124,13 +124,13 @@
 					let res = await queryTargetPoint(e)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.val1 = res.site_code
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.val1 = ''
@@ -173,7 +173,7 @@
 						}
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 					}
@@ -216,7 +216,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/shelf-bind-2nd.vue
+++ b/pages/outbound/shelf-bind-2nd.vue
@@ -120,7 +120,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
@@ -140,7 +140,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/shelf-bind.vue
+++ b/pages/outbound/shelf-bind.vue
@@ -73,13 +73,13 @@
 					let res = await bindOrUnbind(this.val1, this.val2, type)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/outbound/stock-out-store.vue
+++ b/pages/outbound/stock-out-store.vue
@@ -106,7 +106,7 @@
 					}
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/pages/outbound/tray-out-store.vue
+++ b/pages/outbound/tray-out-store.vue
@@ -91,13 +91,13 @@
 					let res = await pdaPalletIostorinvOut(this.index1, this.qty, this.index2)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.disabled = false
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -225,7 +225,7 @@
 					let res = await savePickTask(obj)
 					if (res.code === '200') {
 						uni.showToast({
-							title: res.msg,
+							title: res.message,
 							icon: 'none'
 						})
 						this.clearUp()
@@ -268,9 +268,9 @@
 									
 									<table border=0 cellSpacing=0 cellPadding=0  width="100%" bordercolor="#000000" style="border-collapse:collapse">
 										<tbody>
-											<tr>
-											    <td width="40%">用料单号</td>
-											    <td width="60%">${data.prd_ppbom_no}</td>
+											<tr>
+											    <td width="40%">用料单号</td>
+											    <td width="60%">${data.prd_ppbom_no}</td>
 											</tr>
 											<tr>
 											    <td width="40%">物料编码</td>
--- a/pages/transfer/tray-transfer.vue
+++ b/pages/transfer/tray-transfer.vue
@@ -84,7 +84,7 @@
 					let res = await transfConfirm(this.val1, this.index, this.val2)
 					this.disabled = false
 					uni.showToast({
-						title: res.msg,
+						title: res.message,
 						icon: 'none'
 					})
 				} catch (e) {
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -72,15 +72,25 @@ export const confirmReturnMaterial = (gid, code, sid) => request({
 })

 // 出库管理
-// 物料出库获取物料库存
-export const getMaterialDtl = (search) => request({
+// 线边仓出库获取物料库存
+export const getMaterialDtl = (sid, search) => request({
 	url:'api/pda/iosOut/getMaterialDtl',
-	data: {search: search}
+	data: {sect_id: sid, search: search}
 })
-// 物料出库确认
-export const materialConfirm = (gid, scode, siteCode, strcode) => request({
+// 线边仓出库确认
+export const materialConfirm = (sid, siteCode, obj) => request({
 	url:'api/pda/iosOut/materialConfirm',
-	data: {group_id: gid, storagevehicle_code: scode, siteCode: siteCode, struct_code: strcode}
+	data: {sect_id: sid, siteCode: siteCode, obj}
+})
+// 产线叫料获取物料库存
+export const linegetMaterialDtl = (rcode, search) => request({
+	url:'api/pda/iosOut/getMaterialDtl',
+	data: {region_code: rcode, search: search}
+})
+// 产线叫料确认
+export const callMaterialConfirm = (rcode, siteCode, obj) => request({
+	url:'api/pda/iosOut/callMaterialConfirm',
+	data: {region_code: rcode, siteCode: siteCode, obj}
 })
 // 出库确认获取物料明细
 export const iosOutgetVehicleMaterial = (search) => request({