diff --git a/common/style/layout.styl b/common/style/layout.styl
index c7367d5..897095f 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -569,5 +569,5 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	background #fff
 	border-color #ff6a00
 	color #ff6a00
-	margin-top: 10rpx
+	margin: 14rpx 0
 }
\ No newline at end of file
diff --git a/pages/hdyy/ccgl/kn-hepan.vue b/pages/hdyy/ccgl/kn-hepan.vue
index dca0a43..e41b43a 100644
--- a/pages/hdyy/ccgl/kn-hepan.vue
+++ b/pages/hdyy/ccgl/kn-hepan.vue
@@ -11,6 +11,7 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -21,12 +22,13 @@
 					<view class="zd-col-24 filter_select">
 						<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>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -53,21 +55,23 @@
 								<th>类别</th>
 								<th>规格</th>
 								<th>型号</th>
+								<th>点位</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.code}}</td>
+								<td>{{e.bag_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
-								<td>{{e.leibie}}</td>
-								<td>{{e.guige}}</td>
-								<td>{{e.xinghao}}</td>
+								<td>{{e.canuse_qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -76,7 +80,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认合盘</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !dataList.length}" :disabled="disabled" @tap="_confirmInside">确认合盘</button>
 		</view>
 	</view>
 </template>
@@ -84,7 +88,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {insideCodeInsert, queryPointVehicle, confirmInside} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,9 +97,7 @@
 		data() {
 			return {
 				title: '',
-				options: [],
 				num: null,
-				index: '',
 				val1: '',
 				val2: '',
 				dataList: [],
@@ -105,60 +107,13 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
 				uni.scanCode({
 					success: (res) => {
 						// console.log('扫码成功:', res.result);
-						if (res.result.includes(';')) {
-							const parts = res.result.split(';')
-							if (parts.length !== 5) {
-								uni.showToast({
-									title: '二维码格式不正确，请扫描符合格式的二维码',
-									icon: 'none'
-								})
-								return
-							}
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: parts[0],
-								material_code: parts[1],
-								material_name: parts[2],
-								qty: parts[3],
-								measure_unit_id: parts[4],
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						} else {
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: res.result,
-								material_code: '',
-								material_name: '',
-								qty: '',
-								measure_unit_id: ''
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						}
+						this._insideCodeInsert(res.result)
 					},
 					fail: (err) => {
 						console.log('扫码失败:', err)
@@ -178,29 +133,15 @@
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
+				this.num = null
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _insideCodeInsert (e) {
 				try {
-					let res = await queryPointInDownload()
+					let res = await insideCodeInsert(e)
 					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
-				try {
-					let res = await queryPointInDtl(this.val1)
-					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+						this.dataList.push(res.data)
 					} else {
 						this.dataList = []
 					}
@@ -208,14 +149,34 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			handleChange (e) {
+				if (e) {
+					this._queryPointVehicle(e)
+				}
+			},
+			async _queryPointVehicle (e) {
+				try {
+					let res = await queryPointVehicle(e)
+					if (res) {
+						if (this.val1) {
+							this.val2 = res.data.struct_code
+						}
+						if (this.val2) {
+							this.val1 = res.data.storagevehicle_code
+						}
+					} else {
+					}
+				} catch (e) {
+				}
+			},
+			async _confirmInside () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.val2 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await confirmInside(this.num, this.val1,  this.val2, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/ccgl/sh-instore.vue b/pages/hdyy/ccgl/sh-instore.vue
index a32529d..8c1c5d3 100644
--- a/pages/hdyy/ccgl/sh-instore.vue
+++ b/pages/hdyy/ccgl/sh-instore.vue
@@ -19,6 +19,7 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
+						 @handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -54,16 +55,16 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.code}}</td>
+								<td>{{e.bag_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
-								<td>{{e.leibie}}</td>
-								<td>{{e.guige}}</td>
-								<td>{{e.xinghao}}</td>
+								<td>{{e.canuse_qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -72,7 +73,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">送入</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !index || !dataList.length}" :disabled="disabled" @tap="_receiveConfirmIn">确认入库</button>
 		</view>
 	</view>
 </template>
@@ -80,7 +81,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {queryReceiveSect, queryGroupDtl, receiveConfirmIn} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -100,20 +101,18 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
+			this._queryReceiveSect()
 		},
 		methods: {
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
 				this.dataList = []
-				this.checkedArr = []
-				this.allCheck = false
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _queryReceiveSect () {
 				try {
-					let res = await queryPointInDownload()
+					let res = await queryReceiveSect()
 					if (res) {
 						this.options = res.data
 					} else {
@@ -126,9 +125,14 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _queryPointInDtl () {
+			handleChange (e) {
+				if (e) {
+					this._queryGroupDtl()
+				}
+			},
+			async _queryGroupDtl () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await queryGroupDtl(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -138,14 +142,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _receiveConfirmIn () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.val2 || !this.index || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await receiveConfirmIn(this.index, this.val1,  this.val2, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/ccgl/zj-instore.vue b/pages/hdyy/ccgl/zj-instore.vue
index be26c48..14902e6 100644
--- a/pages/hdyy/ccgl/zj-instore.vue
+++ b/pages/hdyy/ccgl/zj-instore.vue
@@ -37,14 +37,12 @@
 								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>批号</th>
-								<th>出库数量</th>
+								<th>数量</th>
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
 								<th>规格</th>
 								<th>型号</th>
-								<th>点位</th>
-								<th>载具</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -60,8 +58,6 @@
 								<td>{{e.material_type_id}}</td>
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
-								<td>{{e.struct_code}}</td>
-								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -70,7 +66,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认入库</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_confirmPalletAssemblyIn">确认入库</button>
 		</view>
 	</view>
 </template>
@@ -78,7 +74,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getPalletAssembly, confirmPalletAssemblyIn} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -87,9 +83,7 @@
 		data() {
 			return {
 				title: '',
-				options: [],
 				num: null,
-				index: '',
 				val1: '',
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -98,60 +92,13 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
 				uni.scanCode({
 					success: (res) => {
 						// console.log('扫码成功:', res.result);
-						if (res.result.includes(';')) {
-							const parts = res.result.split(';')
-							if (parts.length !== 5) {
-								uni.showToast({
-									title: '二维码格式不正确，请扫描符合格式的二维码',
-									icon: 'none'
-								})
-								return
-							}
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: parts[0],
-								material_code: parts[1],
-								material_name: parts[2],
-								qty: parts[3],
-								measure_unit_id: parts[4],
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						} else {
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: res.result,
-								material_code: '',
-								material_name: '',
-								qty: '',
-								measure_unit_id: ''
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						}
+						this._getPalletAssembly(res.result)
 					},
 					fail: (err) => {
 						console.log('扫码失败:', err)
@@ -173,26 +120,12 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _getPalletAssembly (e) {
 				try {
-					let res = await queryPointInDownload()
+					let res = await getPalletAssembly(e)
 					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
-				try {
-					let res = await queryPointInDtl(this.val1)
-					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+						this.dataList.push(res.data)
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -200,14 +133,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _confirmPalletAssemblyIn () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await confirmPalletAssemblyIn(this.val1, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/ccgl/zj-outstore.vue b/pages/hdyy/ccgl/zj-outstore.vue
index 734dafe..5b0dd55 100644
--- a/pages/hdyy/ccgl/zj-outstore.vue
+++ b/pages/hdyy/ccgl/zj-outstore.vue
@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">总数量</span>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -34,7 +34,6 @@
 								<th>规格</th>
 								<th>型号</th>
 								<th>点位</th>
-								<th>载具</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -44,14 +43,13 @@
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
+								<td><input type="number" class="sin_input" v-model="e.qty"  @blur="handleBlur(e)"></td>
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.material_type_id}}</td>
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
-								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -60,7 +58,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认出库</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !num || !dataList.length}" :disabled="disabled" @tap="_directlyOutConfirm">确认出库</button>
 		</view>
 	</view>
 </template>
@@ -68,7 +66,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {queryPointInDownload, directlyOutCodeInsert, directlyOutConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -90,57 +88,30 @@
 			this._queryPointInDownload()
 		},
 		methods: {
+			handleBlur (e) {
+				if (e.qty) {
+					if (e.qty < 0) {
+						e.qty = 0
+					} else {
+						e.qty = e.qty.replace(/[^0-9]/g, '')
+						e.qty = e.qty.replace(/^0+/, '') || '0'
+						if (e.qty > e.initialQty) {
+							e.qty = e.initialQty
+						}
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					}
+				} else {
+					// uni.showToast({
+					// 	title: '数量必填',
+					// 	icon: 'none'
+					// })
+				}
+			},
 			toScanAdd () {
 				uni.scanCode({
 					success: (res) => {
 						// console.log('扫码成功:', res.result);
-						if (res.result.includes(';')) {
-							const parts = res.result.split(';')
-							if (parts.length !== 5) {
-								uni.showToast({
-									title: '二维码格式不正确，请扫描符合格式的二维码',
-									icon: 'none'
-								})
-								return
-							}
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: parts[0],
-								material_code: parts[1],
-								material_name: parts[2],
-								qty: parts[3],
-								measure_unit_id: parts[4],
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						} else {
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: res.result,
-								material_code: '',
-								material_name: '',
-								qty: '',
-								measure_unit_id: ''
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						}
+						this._directlyOutCodeInsert(res.result)
 					},
 					fail: (err) => {
 						console.log('扫码失败:', err)
@@ -177,11 +148,15 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _queryPointInDtl () {
+			async _directlyOutCodeInsert (e) {
 				try {
-					let res = await queryPointInDtl(this.val1)
-					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+					let res = await directlyOutCodeInsert(e)
+					if (res) {
+						this.dataList.push(res.data)
+						this.dataList.forEach(e => {
+							e.initialQty = e.qty
+						})
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -189,14 +164,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _directlyOutConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.num || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await directlyOutConfirm(this.num, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/kzj/kzj-duidie.vue b/pages/hdyy/kzj/kzj-duidie.vue
index 79c8e58..1ff3ea5 100644
--- a/pages/hdyy/kzj/kzj-duidie.vue
+++ b/pages/hdyy/kzj/kzj-duidie.vue
@@ -9,7 +9,7 @@
 						<span class="filter_label">载具点位</span>
 					</view>
 					<view class="zd-col-24 filter_select">
-						<search-box v-model="val1" @handleChange="handleChange"/>
+						<search-box v-model="val1" />
 					</view>
 				</view>
 			</view>
@@ -26,12 +26,12 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.supp_id === pkId}" @tap="toCheck(e)">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.point_code === pkId}" @tap="toCheck(e)">
 								<td>{{i+1}}</td>
-								<td>{{e.supp_name}}</td>
-								<td>{{e.remark}}</td>
-								<td>{{e.remark}}</td>
-								<td>{{e.remark}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.vehicle_qty}}</td>
+								<td>{{e.execution_task}}</td>
+								<td>{{e.remaining_qty}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -39,7 +39,7 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-24 button-primary" :class="{'button-info': !pkId}" @tap="toSure">呼叫堆叠</button>
+			<button class="zd-col-24 button-primary" :class="{'button-info': !val1 || !pkId}" @tap="_callStackPlates">呼叫堆叠</button>
 		</view>
 	</view>
 </template>
@@ -47,7 +47,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {querySupp} from '@/utils/getData2.js'
+	import {queryPointDtl, callStackPlates} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -64,16 +64,12 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryPointDtl()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._querySupp()
-				}
-			},
-			async _querySupp () {
+			async _queryPointDtl () {
 				try {
-					let res = await querySupp(this.val1)
+					let res = await queryPointDtl(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -84,13 +80,27 @@
 				}
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.supp_id ? '' : e.supp_id
-				this.pkObj = this.pkId === e.supp_id ? e : {}
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+				this.pkObj = this.pkId === e.point_code ? e : {}
 			},
-			toSure () {
-				if (this.pkId) {
-					this.$store.dispatch('setFormData', this.pkObj)
-					uni.navigateBack()
+			async _callStackPlates () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callStackPlates(this.val1, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
 				}
 			}
 		}
diff --git a/pages/hdyy/scgl/point-quhuo.vue b/pages/hdyy/scgl/point-quhuo.vue
index c150610..0578e0d 100644
--- a/pages/hdyy/scgl/point-quhuo.vue
+++ b/pages/hdyy/scgl/point-quhuo.vue
@@ -6,26 +6,27 @@
 			<view class="zd_wrapper">
 				<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">
 						<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">
-						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
-					</view>
-				</view>
 				<view class="zd-row">
 					<button class="zd-col-11 button-primary ftsize1" @tap="toScanAdd">扫码插入</button>
 					<button class="zd-col-11 button-primary ftsize1" @tap="toDel">删除行</button>
 				</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-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -54,7 +55,7 @@
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
+								<td><input type="number" class="sin_input" v-model="e.qty"  @blur="handleBlur(e)"></td>
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.material_type_id}}</td>
@@ -70,9 +71,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">取物料</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">取载具</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">取货完成</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_takePalletMaterial">取物料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeTheVehicle">取载具</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeFinish">取货完成</button>
 		</view>
 	</view>
 </template>
@@ -80,7 +81,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getPalletAssemblyOK, takePalletMaterial, takeTheVehicle, takeFinish} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -89,8 +90,6 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
 				num: null,
 				dataList: [],
@@ -100,7 +99,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
@@ -175,26 +173,36 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
-				try {
-					let res = await queryPointInDownload()
-					if (res) {
-						this.options = res.data
+			handleBlur (e) {
+				if (e.qty) {
+					if (e.qty < 0) {
+						e.qty = 0
 					} else {
-						this.options = []
+						e.qty = e.qty.replace(/[^0-9]/g, '')
+						e.qty = e.qty.replace(/^0+/, '') || '0'
+						if (e.qty > e.initialQty) {
+							e.qty = e.initialQty
+						}
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					}
-				} catch (e) {
-					this.options = []
+				} else {
+					// uni.showToast({
+					// 	title: '数量必填',
+					// 	icon: 'none'
+					// })
 				}
 			},
-			selectChange (e) {
-				this.index = e
+			handleChange (e) {
+				if (e) {
+					this._getPalletAssemblyOK()
+				}
 			},
-			async _queryPointInDtl () {
+			async _getPalletAssemblyOK () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getPalletAssemblyOK(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -202,14 +210,54 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _takePalletMaterial () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await takePalletMaterial(this.val1, this.dataList)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _takeTheVehicle () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await takeTheVehicle(this.val1)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _takeFinish () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await takeFinish()
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/scgl/sc-chuliao.vue b/pages/hdyy/scgl/sc-chuliao.vue
index f799cf7..8f89b66 100644
--- a/pages/hdyy/scgl/sc-chuliao.vue
+++ b/pages/hdyy/scgl/sc-chuliao.vue
@@ -10,7 +10,7 @@
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
-						v-model="val1"
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -26,7 +26,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">总数量</span>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -76,8 +76,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">呼叫agv</button>
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">出料</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine">出料</button>
 		</view>
 	</view>
 </template>
@@ -85,7 +85,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -95,6 +95,7 @@
 			return {
 				title: '',
 				val1: '',
+				val2: '',
 				num: null,
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -113,11 +114,12 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _queryPointInDtl () {
+			async _getGroupBucketInfo () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getGroupBucketInfo(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -125,14 +127,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _productionLine () {
 				this.disabled = true
-				if (!this.val1 || !this.dataList.length) {
+				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.dataList)
+					let res = await productionLine(this.val1, this.val2)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/scgl/sl-huiku.vue b/pages/hdyy/scgl/sl-huiku.vue
index 6288bcb..2c648d4 100644
--- a/pages/hdyy/scgl/sl-huiku.vue
+++ b/pages/hdyy/scgl/sl-huiku.vue
@@ -16,7 +16,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">总数量</span>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -50,7 +50,7 @@
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
+								<td><input type="number" class="sin_input" v-model="e.qty"  @blur="handleBlur(e)"></td>
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.material_type_id}}</td>
@@ -66,7 +66,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">回库</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_leftoverMaterialBack">回库</button>
 		</view>
 	</view>
 </template>
@@ -74,7 +74,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getGroupInfo, leftoverMaterialBack} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -83,8 +83,6 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
 				num: null,
 				dataList: [],
@@ -94,7 +92,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toEmpty () {
@@ -102,26 +99,31 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
-				try {
-					let res = await queryPointInDownload()
-					if (res) {
-						this.options = res.data
+			handleBlur (e) {
+				if (e.qty) {
+					if (e.qty < 0) {
+						e.qty = 0
 					} else {
-						this.options = []
+						e.qty = e.qty.replace(/[^0-9]/g, '')
+						e.qty = e.qty.replace(/^0+/, '') || '0'
+						if (e.qty > e.initialQty) {
+							e.qty = e.initialQty
+						}
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					}
-				} catch (e) {
-					this.options = []
+				} else {
+					// uni.showToast({
+					// 	title: '数量必填',
+					// 	icon: 'none'
+					// })
 				}
 			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
+			async _getGroupInfo () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getGroupInfo(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -129,14 +131,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _leftoverMaterialBack () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await leftoverMaterialBack(this.val1, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/scgl/tp-callmater.vue b/pages/hdyy/scgl/tp-callmater.vue
index cbbf454..6e415a0 100644
--- a/pages/hdyy/scgl/tp-callmater.vue
+++ b/pages/hdyy/scgl/tp-callmater.vue
@@ -22,7 +22,7 @@
 						v-model="val1"
 						/>
 					</view>
-					<button class="mini-btn" type="primary" @tap="_queryPointInDtl">查询</button>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
@@ -30,7 +30,7 @@
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
-						v-model="val1"
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -76,7 +76,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认叫料</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !dataList.length}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
 		</view>
 	</view>
 </template>
@@ -84,7 +84,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {queryPointInDownload, getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -97,6 +97,7 @@
 				num: null,
 				index: '',
 				val1: '',
+				val2: '',
 				materialData: {},
 				dataList: [],
 				dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -105,7 +106,13 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
+			// this._queryPointInDownload()
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
 		},
 		methods: {
 			toJump (name) {
@@ -136,9 +143,9 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _queryPointInDtl () {
+			async _getStockGroupInfo () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getStockGroupInfo('', this.materialData.material_code, this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -148,15 +155,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _confirmCallMaterial () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val2 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
-				this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.num, this.dataList)
+					let res = await confirmCallMaterial(this.val2, '', this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/scgl/yjg-chuliao.vue b/pages/hdyy/scgl/yjg-chuliao.vue
index b02a0e6..14f138b 100644
--- a/pages/hdyy/scgl/yjg-chuliao.vue
+++ b/pages/hdyy/scgl/yjg-chuliao.vue
@@ -16,7 +16,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">总数量</span>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -28,7 +28,7 @@
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
-						v-model="val1"
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -84,7 +84,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">出料</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_preProcessingDown">出料</button>
 		</view>
 	</view>
 </template>
@@ -92,7 +92,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {queryPointInDownload, getGroupInfo, preProcessingDown} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -105,19 +105,22 @@
 				options: [{text:'原粉区', value: '1'}, {text:'批料室', value: '1'}, {text:'粉碎室1', value: 'f1'}, {text:'粉碎室2', value: 'f2'}],
 				index: '',
 				val1: '',
+				val2: '',
 				num: null,
 				dataList: [],
-				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
+			// this._queryPointInDownload()
 		},
 		methods: {
 			toEmpty () {
 				this.val1 = ''
+				this.val2 = ''
+				this.index = ''
+				this.num = ''
 				this.dataList = []
 				this.disabled = false
 			},
@@ -136,11 +139,12 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _queryPointInDtl () {
+			async _getGroupInfo () {
 				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getGroupInfo(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
@@ -148,14 +152,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _preProcessingDown () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await preProcessingDown(this.val1, this.val2, this.index)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/wbc/wbc-enter.vue b/pages/hdyy/wbc/wbc-enter.vue
index 7c4de7a..5f113b4 100644
--- a/pages/hdyy/wbc/wbc-enter.vue
+++ b/pages/hdyy/wbc/wbc-enter.vue
@@ -37,33 +37,21 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>点位</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>批号</th>
 								<th>数量</th>
 								<th>单位</th>
-								<th>供应商</th>
-								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
-								<th>载具</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.point_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
-								<td>{{e.leibie}}</td>
-								<td>{{e.guige}}</td>
-								<td>{{e.xinghao}}</td>
-								<td>{{e.zaiju}}</td>
+								<td>{{e.unit_name}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/wrcdj/wrc-unload.vue b/pages/hdyy/wrcdj/wrc-unload.vue
index 14dce87..94b41ea 100644
--- a/pages/hdyy/wrcdj/wrc-unload.vue
+++ b/pages/hdyy/wrcdj/wrc-unload.vue
@@ -4,20 +4,12 @@
 		<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">
-						<search-box v-model="val1" @handleChange="handleChange"/>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
 						<span class="filter_label">卸货区</span>
 					</view>
 					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -68,7 +60,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointRegion, queryPointDrawDtl, queryDrawConfirm} from '@/utils/getData3.js'
+	import {queryXhRegion, queryPointRegion, queryRegionPoint, queryDrawConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -77,8 +69,6 @@
 		data() {
 			return {
 				title: '',
-				num: null,
-				val1: '',
 				options1: [],
 				index1: '',
 				options2: [],
@@ -94,10 +84,14 @@
 			this.title = options.title
 		},
 		methods: {
+			selectChange (e) {
+				this.index1 = e
+				this._queryRegionPoint()
+			},
 			/** 下拉框*/
-			async _queryPointRegion () {
+			async _queryXhRegion () {
 				try {
-					let res = await queryPointRegion(this.val1)
+					let res = await queryXhRegion()
 					if (res && res.data) {
 						this.options1 = [...res.data]
 					} else {
@@ -110,7 +104,7 @@
 			/** 下拉框*/
 			async _queryPointRegion2 () {
 				try {
-					let res = await queryPointRegion(this.val1)
+					let res = await queryPointRegion()
 					if (res && res.data) {
 						this.options2 = [...res.data]
 					} else {
@@ -121,11 +115,9 @@
 				}
 			},
 			toEmpty () {
-				this.val1 = ''
-				this.num = null
+				this.index1 = ''
+				this.index2 = ''
 				this.dataList = []
-				this.checkedArr = []
-				this.allCheck = false
 				this.disabled = false
 			},
 			toAllCheck () {
@@ -139,39 +131,11 @@
 				this.checkedArr = this.dataList.filter(el => el.checked === true)
 				this.allCheck = this.checkedArr.length === this.dataList.length
 			},
-			handleChange (e) {
-				if (e) {
-					this._queryPointDrawDtl()
-				}
-			},
-			handleBlur (e) {
-				if (e.qty) {
-					if (e.qty < 0) {
-						e.qty = 0
-					} else {
-						e.qty = e.qty.replace(/[^0-9]/g, '')
-						e.qty = e.qty.replace(/^0+/, '') || '0'
-						if (e.qty > e.initialQty) {
-							e.qty = e.initialQty
-						}
-						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
-					}
-				} else {
-					// uni.showToast({
-					// 	title: '数量必填',
-					// 	icon: 'none'
-					// })
-				}
-			},
-			async _queryPointDrawDtl () {
+			async _queryRegionPoint () {
 				try {
-					let res = await queryPointDrawDtl(this.val1)
+					let res = await queryRegionPoint(this.index1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
-						this.dataList.forEach(e => {
-							e.initialQty = e.qty
-						})
-						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					} else {
 						this.dataList = []
 					}
diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index d21b9ea..1ee2258 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -82,17 +82,20 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">组袋并打印</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">确认组袋</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="toZdPrint">组袋并打印</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_confirmBagAssembly">确认组袋</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getCLodop} from '@/utils/CLodopfuncs.js'
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {packConfirmReturn} from '@/utils/getData3.js'
+	import {getDate} from '@/utils/utils.js'
+	const currentDate = getDate({format: true})
+	import {confirmBagAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -102,6 +105,7 @@
 			return {
 				title: '',
 				val1: '',
+				date: currentDate,
 				materialData: {},
 				suppData: {},
 				num: '',
@@ -125,6 +129,12 @@
 			}
 		},
 		methods: {
+			handlePrintConfirm() {
+				// 处理打印逻辑
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.showCustomDialog = false
+				this.toPrint(data)
+			},
 			toJump (name) {
 				uni.navigateTo({
 					url: `/pages/hdyy/wbc/${name}`
@@ -141,14 +151,17 @@
 				this.disabled = false
 				this.disabled1 = false
 			},
-			async _packConfirmReturn () {
+			toZdPrint () {
+				this._confirmBagAssembly()
+			},
+			async _confirmBagAssembly () {
 				this.disabled = true
-				if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+				if (!this.val1 || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packConfirmReturn(this.val1, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.num, this.mark)
+					let res = await confirmBagAssembly(this.val1, this.materialData.material_id, this.suppData.supp_code, this.num, this.pcsn)
 					if (res) {
 						uni.showToast({
 							title: res.message,
@@ -160,6 +173,80 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			// async _printDelete (data) {
+			// 	try {
+			// 		let res = await printDelete(data)
+			// 		if (res) {
+			// 			// console.log('success')
+			// 		}
+			// 	} catch (e) {
+			// 		// console.log('error')
+			// 	}
+			// },
+			labelPrint () {
+				this.disabled1 = true
+				if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				// this.showCustomDialog = true
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.toPrint(data)
+			},
+			toPrint (data) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+					this.disabled1 = false
+				    return
+				}
+				// 按次打印
+				for (let i = 0; i < this.printCount; i++) {
+					LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+					LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+					// 更换为打印服务器ip 不需要加前缀
+					LODOP.PRINT_INIT(null, printUrl);
+					// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
+					LODOP.SET_PRINTER_INDEX(-1);
+					// 设置打印纸大小
+					LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+					LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+					LODOP.SET_PRINT_STYLE('FontSize', 8)
+					LODOP.SET_PRINT_STYLE('Bold', 1)
+					LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
+						data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
+						data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
+					)
+					LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
+					LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
+					LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
+					LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
+					LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
+					LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
+					LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
+
+					LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
+					LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
+					LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
+					LODOP.PRINT();
+					// LODOP.PREVIEW()
+				}
+				// 烘干出库且需要删除的 调用删除接口
+				if (data.out_type === '1004' && data.is_need_delete === '1') {
+					// this.printDelete(data)
+				}
+				uni.showToast({
+					title: '操作成功',
+					icon: 'none'
+				})
+				this.disabled1 = false
 			}
 		}
 	}
diff --git a/pages/hdyy/zpgl/mater-zupan.vue b/pages/hdyy/zpgl/mater-zupan.vue
index 34368ca..50a3fd0 100644
--- a/pages/hdyy/zpgl/mater-zupan.vue
+++ b/pages/hdyy/zpgl/mater-zupan.vue
@@ -38,14 +38,14 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.code}}</td>
+								<td>{{e.bag_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td>{{e.leibie}}</td>
+								<td>{{e.class_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,7 +54,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认组盘</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_confirmPalletAssembly">确认组盘</button>
 		</view>
 	</view>
 </template>
@@ -62,7 +62,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {getBagAssembly, confirmPalletAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -71,8 +71,6 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -81,7 +79,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
@@ -156,24 +153,9 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _getBagAssembly () {
 				try {
-					let res = await queryPointInDownload()
-					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
-				try {
-					let res = await queryPointInDtl(this.val1)
+					let res = await getBagAssembly(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -183,14 +165,14 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			async _confirmPalletAssembly () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await confirmPalletAssembly(this.val1, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index a3e5e12..60f9a0d 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -17,7 +17,7 @@
 						<span class="filter_label">桶自重</span>
 					</view>
 					<view class="zd-col-16">
-						<NumberInput v-model="qty" />
+						<NumberInput v-model="weight" />
 					</view>
 					<view class="zd-col-2"><span class="filter_unit">KG</span></view>
 				</view>
@@ -74,18 +74,21 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">组桶并打印</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">确认组桶</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZtPrint">组桶并打印</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_confirmBucketAssembly">确认组桶</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getCLodop} from '@/utils/CLodopfuncs.js'
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {packConfirmReturn} from '@/utils/getData3.js'
+	import {getDate} from '@/utils/utils.js'
+	const currentDate = getDate({format: true})
+	import {confirmBucketAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -96,9 +99,10 @@
 			return {
 				title: '',
 				val1: '',
+				date: currentDate,
 				materialData: {},
-				qty: '',
-				num: '',
+				weight: '',
+				num: null,
 				unit: 'KG',
 				disabled: false,
 				disabled1: false,
@@ -115,6 +119,12 @@
 			}
 		},
 		methods: {
+			handlePrintConfirm() {
+				// 处理打印逻辑
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.showCustomDialog = false
+				this.toPrint(data)
+			},
 			toJump (name) {
 				uni.navigateTo({
 					url: `/pages/hdyy/wbc/${name}`
@@ -125,19 +135,22 @@
 				this.index1 = ''
 				this.materialData = {}
 				this.pcsn = ''
-				this.num = ''
+				this.num = null
 				this.unit = 'KG'
 				this.disabled = false
 				this.disabled1 = false
 			},
-			async _packConfirmReturn () {
+			toZtPrint () {
+				this._confirmBucketAssembly()
+			},
+			async _confirmBucketAssembly () {
 				this.disabled = true
-				if (!this.val1 || JSON.stringify(this.materialData) === '{}') {
+				if (!this.val1 || !this.weight || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}') {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packConfirmReturn(this.val1, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.pcsn, this.num, this.mark)
+					let res = await confirmBucketAssembly(this.val1, this.weight, this.num, this.pcsn, this.materialData.material_id)
 					if (res) {
 						uni.showToast({
 							title: res.message,
@@ -149,6 +162,80 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			// async _printDelete (data) {
+			// 	try {
+			// 		let res = await printDelete(data)
+			// 		if (res) {
+			// 			// console.log('success')
+			// 		}
+			// 	} catch (e) {
+			// 		// console.log('error')
+			// 	}
+			// },
+			labelPrint () {
+				this.disabled1 = true
+				if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				// this.showCustomDialog = true
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.toPrint(data)
+			},
+			toPrint (data) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+					this.disabled1 = false
+				    return
+				}
+				// 按次打印
+				for (let i = 0; i < this.printCount; i++) {
+					LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+					LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+					// 更换为打印服务器ip 不需要加前缀
+					LODOP.PRINT_INIT(null, printUrl);
+					// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
+					LODOP.SET_PRINTER_INDEX(-1);
+					// 设置打印纸大小
+					LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+					LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+					LODOP.SET_PRINT_STYLE('FontSize', 8)
+					LODOP.SET_PRINT_STYLE('Bold', 1)
+					LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
+						data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
+						data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
+					)
+					LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
+					LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
+					LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
+					LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
+					LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
+					LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
+					LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
+
+					LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
+					LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
+					LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
+					LODOP.PRINT();
+					// LODOP.PREVIEW()
+				}
+				// 烘干出库且需要删除的 调用删除接口
+				if (data.out_type === '1004' && data.is_need_delete === '1') {
+					// this.printDelete(data)
+				}
+				uni.showToast({
+					title: '操作成功',
+					icon: 'none'
+				})
+				this.disabled1 = false
 			}
 		}
 	}
diff --git a/utils/getData3.js b/utils/getData3.js
index cfa32e3..03bf383 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -109,9 +109,20 @@ export const getSectList = (code) => request({
 // 空载具出库
 // 呼叫出库
 export const callEmptyVehicle = (scode, pcode, vtype, vnum) => request({
-	url:'/api/pdaCommon/callEmptyVehicle',
+	url:'api/pdaCommon/callEmptyVehicle',
 	data: {sect_code: scode, point_code: pcode, vehicle_type: vtype, vehicle_num: vnum}
 })
+// 空载具堆叠（空载具管理）共 (2) 个
+// 查询明细列表
+export const queryPointDtl = () => request({
+	url:'api/pdaCommon/queryPointDtl',
+	data: {}
+})
+// 呼叫堆叠
+export const callStackPlates = (pcode, row) => request({
+	url:'api/pdaCommon/callStackPlates',
+	data: {point_code: pcode, row: row}
+})
 
 /**
  * 组盘管理
@@ -153,6 +164,52 @@ export const confirmPalletAssemblyIn = (search, rows) => request({
 	data: {search: search, rows: rows}
 })
 
+// 收货入库（仓储管理）共 (3) 个
+// 查询库区下拉框
+export const queryReceiveSect = () => request({
+	url:'api/pdaWarehouse/queryReceiveSect',
+	data: {}
+})
+// 查询列表明细
+export const queryGroupDtl = (vcode) => request({
+	url:'api/pdaWarehouse/queryGroupDtl',
+	data: {vehicle_code: vcode}
+})
+// 确认入库
+export const receiveConfirmIn = (scode, vcode, pcode, rows) => request({
+	url:'api/pdaWarehouse/receiveConfirmIn',
+	data: {sect_code: scode, vehicle_code: vcode, point_code: pcode, rows: rows}
+})
+
+// 直接出库（仓储管理）共 (2) 个
+// 扫码插入
+export const directlyOutCodeInsert = (bcode) => request({
+	url:'api/pdaWarehouse/directlyOutCodeInsert',
+	data: {bag_code: bcode}
+})
+// 确认出库
+export const directlyOutConfirm = (qty, rows) => request({
+	url:'api/pdaWarehouse/directlyOutConfirm',
+	data: {total_qty: qty, rows: rows}
+})
+
+// 库内合盘（仓储管理）共 (3) 个
+// 扫码插入
+export const insideCodeInsert = (bcode) => request({
+	url:'api/pdaWarehouse/insideCodeInsert',
+	data: {bag_code: bcode}
+})
+// 查询载具/点位
+export const queryPointVehicle = (scode, stcode) => request({
+	url:'api/pdaWarehouse/queryPointVehicle',
+	data: {storagevehicle_code: scode, struct_code: stcode}
+})
+// 确认合盘
+export const confirmInside = (qty, scode, stcode, rows) => request({
+	url:'api/pdaWarehouse/confirmInside',
+	data: {total_qty: qty, storagevehicle_code: scode, struct_code: stcode, rows: rows}
+})
+
 /**
  * 生产管理
  */
@@ -163,9 +220,9 @@ export const getGroupInfo = (search) => request({
 	data: {search: search}
 })
 // 剩料回库
-export const leftoverMaterialBack = (search) => request({
+export const leftoverMaterialBack = (search, rows) => request({
 	url:'/api/pdaProduction/leftoverMaterialBack',
-	data: {search: search}
+	data: {search: search, rows: rows}
 })
 
 // 托盘叫料