From 26ed7822b252483df255d9a2cf29fcecbaaa25ab Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 19 Aug 2025 10:16:55 +0800
Subject: [PATCH] change

---
 pages/entry/mater-group-to-store.vue  | 110 +++---------
 pages/entry/mater-group-to-store0.vue | 233 ++++++++++++++++++++++++++
 pages/home/home.vue                   |   2 +-
 pages/zw/materbox-instore.vue         | 161 +++++++++---------
 utils/getData4.js                     |  18 +-
 5 files changed, 361 insertions(+), 163 deletions(-)
 create mode 100644 pages/entry/mater-group-to-store0.vue

diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
index b3baa93..452d166 100644
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -28,14 +28,6 @@
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" 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.unit_name" disabled>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">物料单重</span>
@@ -54,10 +46,10 @@
 				</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-17">
-						<NumberInput v-model="currentData.qty" />
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -72,39 +64,17 @@
 					<view class="zd-col-7">
 						<span class="filter_label">仓库编码</span>
 					</view>
-					<view class="zd-col-17 filter_select">
-						<!-- <search-box v-model="currentData.stor_code"/> -->
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						/>
 					</view>
 				</view>
 			</view>
 		</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="_combination">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -113,7 +83,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 {suppList, combination} from '@/utils/getData4.js'
+	
 	export default {
 		components: {
 			NavBar,
@@ -122,39 +93,21 @@
 		},
 		data() {
 			return {
+				val1: '',
 				title: '',
 				currentData: {},
 				options: [],
 				index: '',
-				disabled: false,
-				kwData: {}
+				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._storList()
+			this._suppList()
 		},
 		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', '')
 			}
 		},
@@ -162,13 +115,16 @@
 			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)
-					})
+			async _suppList () {
+				try {
+					let res = await suppList()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options = []
+					}
+				} catch (e) {
+					this.options = []
 				}
 			},
 			toJump () {
@@ -183,19 +139,6 @@
 					} 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 () {
@@ -205,17 +148,16 @@
 				this.currentData = {}
 				this.index = ''
 				this.disabled = false
-				this.kwData = {}
 			},
-			async _groupMaterIn () {
+			async _combination () {
 				this.disabled = true
 				if (JSON.stringify(this.currentData) === '{}') {
 					this.disabled = false
 					return
 				}
 				try {
-					this.currentData.stor_code = this.index
-					let res = await groupMaterIn(this.index, this.currentData)
+					let selobj = this.options.find(item => item.value === this.index)
+					let res = await combination(this.currentData.material_code, this.currentData.pcsn, this.currentData.material_id, selobj.text, '', this.currentData.single_weight)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/entry/mater-group-to-store0.vue b/pages/entry/mater-group-to-store0.vue
new file mode 100644
index 0000000..b3baa93
--- /dev/null
+++ b/pages/entry/mater-group-to-store0.vue
@@ -0,0 +1,233 @@
+<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">
+						<input type="text" class="filter_input" v-model="currentData.material_code" @tap="toJump">
+					</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.material_name" 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.material_spec" 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.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料单重</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="currentData.single_weight" />
+					</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="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<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-17">
+						<search-box v-model="currentData.vehicle_code" @handleChange="handleChange" @handleDel="handleDel" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<!-- <search-box v-model="currentData.stor_code"/> -->
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</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>
+		</view>
+	</view>
+</template>
+
+<script>
+	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'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		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 _groupMaterIn () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				try {
+					this.currentData.stor_code = this.index
+					let res = await groupMaterIn(this.index, this.currentData)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d3a3d6a..9736534 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,7 +41,7 @@
 			return {
 				userName: '',
 				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: '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: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
diff --git a/pages/zw/materbox-instore.vue b/pages/zw/materbox-instore.vue
index ede13c7..099f4bf 100644
--- a/pages/zw/materbox-instore.vue
+++ b/pages/zw/materbox-instore.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 料桶出入 -->
+		<!-- 料桶组盘 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -25,84 +25,89 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label filter_input_disabled">托盘码</span>
+				<view v-if="Object.prototype.toString.call(currentData) === '[object Object]' ">
+					<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.storagevehicle_code" disabled>
+						</view>
 					</view>
-					<view class="zd-col-17">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.storagevehicle_code" disabled>
+					<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.pcsn" 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.qty" 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.qty_unit_name" 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 filter_input_disabled">物料编码</span>
+						</view>
+						<view class="zd-col-17">
+							<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.material_name" 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.material_spec" 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.material_model" disabled>
+						</view>
 					</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.pcsn" 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.qty" 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.qty_unit_name" 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 filter_input_disabled">物料编码</span>
-					</view>
-					<view class="zd-col-17">
-						<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.material_name" 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.material_spec" 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.material_model" disabled>
-					</view>
+				<view v-if="typeof currentData === 'string'">
+					<view class="msg_item">提示：当前是空载具</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_checkStruct">检查站点</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val2}" :disabled="disabled" @tap="_jbGetLtInfo">刷新数据</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled3" @tap="_checkStruct">空桶取出</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_jbGetLtInfo">刷新数据</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled3" @tap="_jbEmptyTakeOut">空桶取出</button>
 			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || flag === '2'}" :disabled="disabled2" @tap="_confirmSet">确认放置</button>
 		</view>
 	</view>
@@ -155,7 +160,6 @@
 				}
 			},
 			async _checkStruct () {
-				console.log(1111)
 				this.disabled = true
 				if (!this.val1) {
 					this.disabled = false
@@ -183,12 +187,12 @@
 			},
 			async _jbGetLtInfo () {
 				this.disabled = true
-				if (!this.val2) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await jbGetLtInfo(this.val2)
+					let res = await jbGetLtInfo(this.val1, this.val2)
 					if (res.code === '200') {
 						this.currentData = res.data
 						uni.showToast({
@@ -262,5 +266,12 @@
 </script>
 
 <style lang="stylus">
-
+.msg_item {
+	font-size: 28rpx;
+	line-height: 30rpx;
+	font-weight: 700;
+	color: #ff6a00;
+	margin-top: 30rpx;
+	word-break: break-all;
+}
 </style>
diff --git a/utils/getData4.js b/utils/getData4.js
index 0419135..f681da4 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -38,6 +38,7 @@ export const getMaterialList = (search, page, size) => request({
 	data: {search: search, page: page, size: size}
 })
 
+
 // 入库管理
 // 物料组盘确认
 // export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({
@@ -129,6 +130,11 @@ export const pointList = (rcode) => request({
 	url:'api/pda/schPoint/pointList',
 	data: {region_code: rcode}
 })
+// 供应商下拉框
+export const suppList = () => request({
+	url:'api/pda/jb/suppList',
+	data: {}
+})
 
 // 解包上料
 // 获取工单表格数据
@@ -171,9 +177,9 @@ export const confirmSet = (pcode, vcode) => request({
 	data: {point_code: pcode, vehicle_code: vcode}
 })
 // 获取料桶组盘信息
-export const jbGetLtInfo = (vcode) => request({
+export const jbGetLtInfo = (scode, vcode) => request({
 	url:'api/pda/jb/jbGetLtInfo',
-	data: {vehicle_code: vcode}
+	data: {struct_code: scode, vehicle_code: vcode}
 })
 // 空桶取出
 export const jbEmptyTakeOut = (pcode) => request({
@@ -277,4 +283,10 @@ export const zwgroupPlate = (vcode, mid, qty, ecode) => request({
 export const getFormMaterial = (ecode) => request({
 	url:'api/pda/iosIn/getFormMaterial',
 	data: {ext_code: ecode}
-})
\ No newline at end of file
+})
+
+// 物料组盘入库
+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}
+})