diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue
index 189d628..65aaa61 100644
--- a/compoment/tiplist/tiplist.vue
+++ b/compoment/tiplist/tiplist.vue
@@ -457,7 +457,7 @@
 		left: 0;
 		top: 0;
 		background-color: #00000050;
-		z-index: 9999;
+		z-index: 999;
 	}
 
 	.modtips {
diff --git a/compoment/tips/tips.vue b/compoment/tips/tips.vue
index e70f959..26d07f1 100644
--- a/compoment/tips/tips.vue
+++ b/compoment/tips/tips.vue
@@ -18,60 +18,61 @@
 <script lang="ts" setup>
 	import { detailsType } from '@/interfaces/compoment/tips'
 	import { reactive, toRefs } from "vue";
-	let details=reactive<detailsType>({
-		isshow:false,
-		title:'',
-		content:'',
-		isshowcancel:true,
-		cancelTxt:'',
-		confirmTxt:'',
-		success:null,
-		cancel:null,
-		close:null
+	let details = reactive<detailsType>({
+		isshow: false,
+		title: '',
+		content: '',
+		isshowcancel: true,
+		cancelTxt: '',
+		confirmTxt: '',
+		success: null,
+		cancel: null,
+		close: null
 	})
-	const emit=defineEmits(['cancel','confirm'])
-	function setisshow(value:boolean){
-		details.isshow=value
+	const emit = defineEmits(['cancel', 'confirm'])
+	function setisshow(value : boolean) {
+		details.isshow = value
 	}
-	function setdetails(value:any){
-		for(let key in value){
-			details[key]=value[key]
+	function setdetails(value : any) {
+		for (let key in value) {
+			details[key] = value[key]
 		}
 	}
-	function checkbox(type:number){
-		switch (type){
+	function checkbox(type : number) {
+		switch (type) {
 			case 0:
-				if(details.close){
+				if (details.close) {
 					details.close()
 				}
 				break;
 			case 1:
-				if(details.cancel){
+				if (details.cancel) {
 					details.cancel()
 				}
 				break;
 			case 2:
-				if(details.success){
+				if (details.success) {
 					details.success()
 				}
 				break;
 		}
 	}
-	defineExpose({setisshow,setdetails})
-	const { isshow,title,content,isshowcancel,cancelTxt,confirmTxt }=toRefs(details)
+	defineExpose({ setisshow, setdetails })
+	const { isshow, title, content, isshowcancel, cancelTxt, confirmTxt } = toRefs(details)
 </script>
 
 <style lang="scss" scoped>
-	.bgmab{
+	.bgmab {
 		width: 100vw;
 		height: 100vh;
 		position: fixed;
 		left: 0;
 		top: 0;
 		background-color: #00000050;
-		z-index: 99999;
+		z-index: 999;
 	}
-	.modtips{
+
+	.modtips {
 		width: 630upx;
 		// height: 63upx;
 		background: #FFFFFF;
@@ -79,28 +80,32 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding:40upx 20upx;
+		padding: 40upx 20upx;
 		position: absolute;
 		left: 50%;
 		top: 50%;
 		transform: translateX(-50%) translateY(-50%);
 		box-sizing: border-box;
-		.title{
+
+		.title {
 			font-size: 34upx;
 			color: #092C4D;
 		}
-		.contents{
+
+		.contents {
 			max-width: 480upx;
 			font-size: 29upx;
-			color:#90A0AF;
+			color: #90A0AF;
 			margin-top: 30upx;
 		}
-		.buts{
+
+		.buts {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			margin-top: 40upx;
-			>view{
+
+			>view {
 				display: flex;
 				align-items: center;
 				justify-content: center;
@@ -109,15 +114,17 @@
 				border-radius: 8upx;
 				font-size: 32upx;
 			}
-			>.cancel{
+
+			>.cancel {
 				background-color: #F5F5F6;
 				color: #5A6875;
 				margin-right: 20upx;
 			}
-			>.confirm{
+
+			>.confirm {
 				background-color: #D3832A;
 				color: #FFFFFF;
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesHome/pages/DownGoods/DownGoods.vue b/pagesHome/pages/DownGoods/DownGoods.vue
index fe536a0..8297b95 100644
--- a/pagesHome/pages/DownGoods/DownGoods.vue
+++ b/pagesHome/pages/DownGoods/DownGoods.vue
@@ -346,12 +346,6 @@
 			details.typelist = ['订单号', '运单号']
 			utils.ttsspke(`当前下架方式为${op.pageName}, 请录入订单号或运单号`)
 		}
-
-		// 上架页面跳转 -- 按托盘下架
-		if (op.trayCode) {
-			details.scancode = op.trayCode
-			scandata()
-		}
 	})
 
 	onShow(() => {
diff --git a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
index 6bbda49..ec7a787 100644
--- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
+++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
@@ -222,12 +222,16 @@
 						</view>
 					</view>
 
+					<view class="downloadBtn" @click="handleDownLoad(item)">
+						下架
+					</view>
+
 					<image v-if="Number(details.upshelfScanType)!=3" class="qtimgzt"
 						:src="item.totalNum==item.shelfNum?'/pagesHome/static/qitao.png':'/pagesHome/static/weiqitao.png'">
 					</image>
 				</view>
 
-				<view class="item1" v-if="checkstate==3&&reqobj.trayCode">
+				<view class="item1" v-if="checkstate==3">
 					<view>
 						<image src="/pagesHome/static/kuweiicon.png"></image>
 						<view>托盘码：{{reqobj.trayCode + `(${reqobj.trayName})`}}</view>
@@ -236,6 +240,11 @@
 						<image src="/pagesHome/static/scanicon.png"></image>
 						<view>扫码包数：{{reqobj.trayNum}}</view>
 					</view>
+					<view>
+						<view class="downloadBtn" @click="handleDownLoadByTray">
+							下架
+						</view>
+					</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -247,6 +256,7 @@
 		</view>
 		<view @click="uplist">上架</view>
 	</view>
+
 	<view class="tanchuangbg" v-if="showstate">
 		<view class="inputbox" @click.stop.prevent v-if="showstate==2">
 			<view class="makinp" @click="checkmake" v-if="details.upshelfScanType=='3'||details.upshelfScanType=='4'">
@@ -340,6 +350,65 @@
 	<!-- #endif -->
 	<tips ref="tip"></tips>
 	<tiplist ref="tiplists"></tiplist>
+
+	<!-- 下架 -- 包条 -->
+	<PopUp ref="downLoadByOrder">
+		<view class="downLoadByOrder_control">
+			<!-- 全选 -->
+			<image
+				v-show="chooseOrderPackageCodeList.length === details.orderPackageCodeList.length&&chooseOrderPackageCodeList.length !== 0"
+				src="/pagesHome/static/downcheck.png" @click="handleCloseCheck"></image>
+
+			<!-- 部分选 -->
+			<image v-show="
+				chooseOrderPackageCodeList.length !== details.orderPackageCodeList.length
+				&& chooseOrderPackageCodeList.length > 0
+				" src="/pagesHome/static/miniqc.png" @click="handleCheckAll"></image>
+
+			<!-- 全未选 -->
+			<image v-show="chooseOrderPackageCodeList.length === 0" src="/pagesHome/static/downnocheck.png"
+				@click="handleCheckAll"></image>
+		</view>
+
+		<scroll-view scroll-y="true" style="height: 35vh;">
+			<block v-for="item in details.orderPackageCodeList" :key="item.code">
+				<view class="downloadRow" @click="handleCheck(item)">
+					<image v-if="!item.checked" src="/pagesHome/static/downnocheck.png"></image>
+					<image v-if="item.checked" src="/pagesHome/static/downcheck.png"></image>
+					<view>{{item.code}}</view>
+				</view>
+			</block>
+		</scroll-view>
+	</PopUp>
+
+	<!-- 下架 -- 库存品 || 零担 -->
+	<PopUp ref="downLoadByStock">
+		<view style="word-break: break-all;">
+			<text>
+				{{details.stockItem.goodsType === 2?'运单号': '物料名称'}}：
+			</text>
+			<text>
+				{{details.stockItem.goodsType === 2?details.stockItem.waybillNo: details.stockItem.materialName }}
+			</text>
+		</view>
+
+		<view class="mt10">
+			<text>
+				上架数：
+			</text>
+			<text>
+				{{details.stockItem.shelfNum}}
+			</text>
+		</view>
+
+		<view class="downLoadByStock_row mt10">
+			<view>
+				下架数：
+			</view>
+
+			<input v-model="details.enterNum" type="number" />
+		</view>
+	</PopUp>
 </template>
 
 <script lang="ts" setup>
@@ -350,6 +419,11 @@
 		warehouseUpdownTypeupShelfZeroOrder,
 		warehouseUpdownTypegetStockByParam,
 		warehouseUpdownTypeupShelfStockList,
+		postorderUpshelfDetailByAllocationId,
+		warehouseUpdownTypedownPackage,
+		warehouseUpdownTypedownStock,
+		warehouseUpdownTypedownZeroOrder,
+		warehouseUpdownTypedownTrayCode
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -369,6 +443,9 @@
 	// 组件实例
 	const tip = ref(null)
 	const tiplists = ref(null)
+	/** 下架 -- 包条 */
+	const downLoadByOrder = ref()
+	const downLoadByStock = ref()
 
 	let details = reactive({
 		checkstate: 1,
@@ -387,7 +464,17 @@
 		pageName: "",
 		/** 是否执行扫描函数 */
 		isScan: true,
+		/** 包件list */
+		orderPackageCodeList: [],
+		/** 库存品 || 零担 提交数 */
+		enterNum: 0,
+		/** 库存品 || 零担被选中的数据 */
+		stockItem: {}
 	})
+
+	/** 被选中的包件 */
+	const chooseOrderPackageCodeList = ref([])
+
 	onLoad((op) => {
 		details.pageName = op.pageName
 		details.upshelfScanType = op.type
@@ -757,6 +844,204 @@
 		}, 200)
 	}
 
+	/** 按托盘下架 */
+	const handleDownLoadByTray = () => {
+		if (!details.reqobj.trayCode) return uni.showToast({
+			title: '托盘数据有存在异常',
+			icon: 'none'
+		})
+
+		tip.value.setdetails({
+			title: '提示',
+			content: '确认下架？',
+			confirmTxt: '确认',
+			isshow: true,
+			isshowcancel: true,
+			success: async () => {
+				let res : any = null
+				const data = {
+					trayCode: details.reqobj.trayCode
+				}
+				res = await warehouseUpdownTypedownTrayCode(data, { isShowLoading: true })
+
+				if (res.code == 200) {
+					// utils.ttsspke(`成功上架${_totalShelfNum}件`)
+					details.uplistarr = []
+					details.scancode = details.allocationId
+					details.allocationId = ''
+					scandata()
+				}
+
+				tip.value.setisshow(false)
+			},
+			cancel: () => {
+				tip.value.setisshow(false)
+			},
+			close: () => {
+				tip.value.setisshow(false)
+			}
+		})
+	}
+
+	/** 移除待上架数据 */
+	const handleRemove = (index : number) => {
+		details.uplistarr.splice(index, 1)
+	}
+
+	/** 下架 -- 订单 -- 全选 */
+	const handleCheckAll = () => {
+		const _arr = []
+
+		for (let iterator of details.orderPackageCodeList) {
+			iterator.checked = true
+			_arr.push(iterator.code)
+		}
+
+		chooseOrderPackageCodeList.value = _arr
+	}
+
+	/** 下架 -- 订单 -- 全部取消选择 */
+	const handleCloseCheck = () => {
+		chooseOrderPackageCodeList.value = []
+
+		for (let iterator of details.orderPackageCodeList) {
+			iterator.checked = false
+		}
+	}
+
+	/** 下架 -- 订单 -- 单个点击 */
+	const handleCheck = (item) => {
+		if (item.checked) chooseOrderPackageCodeList.value.splice(chooseOrderPackageCodeList.value.indexOf(item.code), 1)
+		else chooseOrderPackageCodeList.value.push(item.code)
+
+		item.checked = !item.checked
+	}
+
+
+	/** 下架库位中订单内包件 */
+	const handleDownLoadByOrder = async (item : any) => {
+		console.log('item :>> ', item);
+
+		const res = await postorderUpshelfDetailByAllocationId({
+			orderCode: item.orderCode,
+			allocationId: details.allocationId
+		})
+
+		if (res.code !== 200) return
+
+		details.orderPackageCodeList = res.data && res.data.map(val => {
+			return {
+				code: val,
+				checked: true
+			}
+		}) || []
+
+		chooseOrderPackageCodeList.value = res.data || []
+
+		downLoadByOrder.value.setDetails({
+			title: '包件下架',
+			showPopUp: true,
+			async success() {
+				if (details.orderPackageCodeList.length === 0) return uni.showToast({
+					title: '没有需要下架的数据',
+					icon: 'none'
+				})
+
+				if (chooseOrderPackageCodeList.value.length === 0) return uni.showToast({
+					title: '最少选择一条需要下架的数据',
+					icon: 'none'
+				})
+
+				const submitData = {
+					upShelfPackageList: chooseOrderPackageCodeList.value.map((val) => {
+						return { orderPackageCode: val }
+					})
+				}
+
+				const res = await warehouseUpdownTypedownPackage(submitData)
+				if (res.code !== 200) return
+
+				details.scancode = details.allocationId
+				scandata()
+				downLoadByOrder.value.details.showPopUp = false
+			}
+		})
+	}
+
+	/** 下架库位中零担 || 库存品 */
+	const handleDownLoadByStock = async (item : any) => {
+		const content = item.goodsType === 2 ? '零担下架' : '库存品下架'
+		details.stockItem = item
+		details.enterNum = item.shelfNum
+
+		downLoadByStock.value.setDetails({
+			title: content,
+			showPopUp: true,
+			async success() {
+				let content = ''
+
+				if (!utils.isNumber(details.enterNum)) {
+					content = '请输入数字'
+				} else {
+					// 去除小数位
+					details.enterNum = Math.floor(details.enterNum)
+
+					if (details.enterNum <= 0) content = '请输入大于0的数量'
+					else if (details.enterNum > details.stockItem.shelfNum) content = '不能大于上架数量'
+				}
+
+				if (content) return uni.showToast({
+					title: content,
+					icon: 'none'
+				})
+
+				let res = {}
+
+				if (details.stockItem.goodsType === 2) {
+					// 零担下架
+					const data = {
+						upShelfZeroOrderList: [
+							{
+								waybillCode: details.stockItem.waybillNo,
+								orderCode: details.stockItem.orderCode,
+								enterNum: details.enterNum,
+								allocationId: details.allocationId,
+							}]
+					}
+					res = await warehouseUpdownTypedownZeroOrder(data)
+				} else {
+					// 
+					const data = {
+						upShelfStockList: [{
+							marketId: details.stockItem.marketId,
+							materialCode: details.stockItem.materialCode,
+							incomingBatch: details.stockItem.incomingBatch,
+							enterNum: details.enterNum,
+							allocationId: details.allocationId,
+						}]
+					}
+					res = await warehouseUpdownTypedownStock(data)
+				}
+
+				console.log('res :>> ', res);
+
+				if (res.code !== 200) return
+
+				details.scancode = details.allocationId
+				scandata()
+				downLoadByStock.value.details.showPopUp = false
+			}
+		})
+	}
+
+	const handleDownLoad = (item) => {
+		const { goodsType } = item
+
+		if (goodsType === 0 || goodsType === 1) handleDownLoadByOrder(item)
+		else if (goodsType === 2) handleDownLoadByStock(item)
+		else if (goodsType === 3) handleDownLoadByStock(item)
+	}
+
 	const {
 		checkinarr,
 		checkmakindex,
@@ -773,7 +1058,7 @@
 	} = toRefs(details)
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.tanchuangbg {
 		width: 100%;
 		height: 100%;
@@ -1331,6 +1616,70 @@
 		}
 	}
 
+	// 下架按钮
+	.downloadBtn {
+		flex: none;
+		width: fit-content;
+		background: var(--subjectColor);
+		color: #fff !important;
+		margin: 10upx auto;
+		padding: 20upx 40upx;
+		font-size: 0.9rem;
+		border-radius: 10upx;
+	}
+
+	// 下架 -- 包件
+	.downloadRow {
+		display: flex;
+		align-items: center;
+		padding: 18upx 24upx;
+		box-sizing: border-box;
+		border-bottom: 4upx solid #EEEEEE;
+
+		image {
+			flex: none;
+			width: 52upx;
+			height: 52upx;
+			margin-right: 15upx;
+		}
+
+		>view {
+			font-size: 0.9rem;
+			font-weight: bold;
+			color: #020B18;
+		}
+	}
+
+	.downLoadByOrder_control {
+		>image {
+			width: 52upx;
+			height: 52upx;
+			margin-left: 20upx;
+		}
+	}
+
+	// 零担 || 库存品下架 
+	.downLoadByStock_row {
+		display: flex;
+		align-items: center;
+
+		>view {
+			font-weight: bold;
+			font-size: 0.9rem;
+		}
+
+		>input {
+			flex: 1;
+			background: #F4F8FB;
+			padding: 10upx 20upx;
+			border-radius: 10upx;
+		}
+	}
+
+	.mt10 {
+		margin-top: 20upx;
+	}
+
 	.flex-c-sb {
 		display: flex;
 		align-items: center;
diff --git a/pagesHome/pages/ScanUp/ScanUp.vue b/pagesHome/pages/ScanUp/ScanUp.vue
index 73b6379..abe0131 100644
--- a/pagesHome/pages/ScanUp/ScanUp.vue
+++ b/pagesHome/pages/ScanUp/ScanUp.vue
@@ -151,8 +151,10 @@
 									<view>上架数量：{{item.shelfNum}}</view>
 								</view>
 							</view>
+						</template>
 
-							<view class="downloadBtn" @click="handleDownLoadByOrder(item)">
+						<template v-if="details.checkstate === 2">
+							<view class="downloadBtn" @click="handleDownLoad(item)">
 								下架
 							</view>
 						</template>
@@ -186,6 +188,7 @@
 	/* #endif */
 	<view class="butbox">
 		<view @click="uplist">上架</view>
+		<view @click="moni">模拟</view>
 	</view>
 	<!-- #ifdef APP -->
 	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
@@ -196,7 +199,8 @@
 	<PopUp ref="downLoadByOrder">
 		<view class="downLoadByOrder_control">
 			<!-- 全选 -->
-			<image v-show="chooseOrderPackageCodeList.length === details.orderPackageCodeList.length"
+			<image
+				v-show="chooseOrderPackageCodeList.length === details.orderPackageCodeList.length&&chooseOrderPackageCodeList.length !== 0"
 				src="/pagesHome/static/downcheck.png" @click="handleCloseCheck"></image>
 
 			<!-- 部分选 -->
@@ -223,8 +227,25 @@
 
 	<!-- 下架 -- 库存品 || 零担 -->
 	<PopUp ref="downLoadByStock">
+		<view style="word-break: break-all;">
+			<text>
+				{{details.stockItem.goodsType === 2?'运单号': '物料名称'}}：
+			</text>
+			<text>
+				{{details.stockItem.goodsType === 2?details.stockItem.waybillNo: details.stockItem.materialName }}
+			</text>
+		</view>
+
+		<view class="mt10">
+			<text>
+				上架数：
+			</text>
+			<text>
+				{{details.stockItem.shelfNum}}
+			</text>
+		</view>
 
-		<view class="downLoadByStock_row">
+		<view class="downLoadByStock_row mt10">
 			<view>
 				下架数：
 			</view>
@@ -242,7 +263,10 @@
 		warehouseUpdownTypeupShelfPackage,
 		warehouseUpdownTypeupShelfTray,
 		postorderUpshelfDetailByAllocationId,
-		warehouseUpdownTypedownPackage
+		warehouseUpdownTypedownPackage,
+		warehouseUpdownTypedownStock,
+		warehouseUpdownTypedownZeroOrder,
+		warehouseUpdownTypedownTrayCode
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -255,9 +279,9 @@
 	import useSystemSettingsStore from '@/store/useSystemSettingsStore';
 	import useStorageStore from '@/store/useStorageStore';
 	import { storeToRefs } from 'pinia';
+	import utils from '@/utils/utils.js';
 	const { HANDLE_ISSTORAGECODE } = useStorageStore()
 	const { scanState } = storeToRefs(useSystemSettingsStore())
-	const utils = inject('utils') as any
 	const tip = ref(null)
 	let details = reactive({
 		checkstate: 1,
@@ -273,7 +297,9 @@
 		/** 包件list */
 		orderPackageCodeList: [],
 		/** 库存品 || 零担 提交数 */
-		enterNum: 0
+		enterNum: 0,
+		/** 库存品 || 零担被选中的数据 */
+		stockItem: {}
 	})
 	/** 被选中的包件 */
 	const chooseOrderPackageCodeList = ref([])
@@ -313,9 +339,6 @@
 			}
 		})
 		// #endif
-
-		await nextTick()
-		downLoadByStock.value.details.showPopUp = true
 	})
 
 	// 关闭扫描监听
@@ -614,9 +637,36 @@
 			icon: 'none'
 		})
 
-		let url = '/pagesHome/pages/DownGoods/DownGoods?type=' + 1 + '&pageName=' + '按托盘下架' + '&trayCode=' + details.reqobj.trayCode
-		uni.navigateTo({
-			url
+		tip.value.setdetails({
+			title: '提示',
+			content: '确认下架？',
+			confirmTxt: '确认',
+			isshow: true,
+			isshowcancel: true,
+			success: async () => {
+				let res : any = null
+				const data = {
+					trayCode: details.reqobj.trayCode
+				}
+				res = await warehouseUpdownTypedownTrayCode(data, { isShowLoading: true })
+
+				if (res.code == 200) {
+					// utils.ttsspke(`成功上架${_totalShelfNum}件`)
+					details.uplistarr = []
+					details.scancode = details.allocationId
+					details.allocationId = ''
+					details.renderList = []
+					scandata()
+				}
+
+				tip.value.setisshow(false)
+			},
+			cancel: () => {
+				tip.value.setisshow(false)
+			},
+			close: () => {
+				tip.value.setisshow(false)
+			}
 		})
 	}
 
@@ -625,8 +675,40 @@
 		details.uplistarr.splice(index, 1)
 	}
 
+	/** 下架 -- 订单 -- 全选 */
+	const handleCheckAll = () => {
+		const _arr = []
+
+		for (let iterator of details.orderPackageCodeList) {
+			iterator.checked = true
+			_arr.push(iterator.code)
+		}
+
+		chooseOrderPackageCodeList.value = _arr
+	}
+
+	/** 下架 -- 订单 -- 全部取消选择 */
+	const handleCloseCheck = () => {
+		chooseOrderPackageCodeList.value = []
+
+		for (let iterator of details.orderPackageCodeList) {
+			iterator.checked = false
+		}
+	}
+
+	/** 下架 -- 订单 -- 单个点击 */
+	const handleCheck = (item) => {
+		if (item.checked) chooseOrderPackageCodeList.value.splice(chooseOrderPackageCodeList.value.indexOf(item.code), 1)
+		else chooseOrderPackageCodeList.value.push(item.code)
+
+		item.checked = !item.checked
+	}
+
+
 	/** 下架库位中订单内包件 */
 	const handleDownLoadByOrder = async (item : any) => {
+		console.log('item :>> ', item);
+
 		const res = await postorderUpshelfDetailByAllocationId({
 			orderCode: item.orderCode,
 			allocationId: details.allocationId
@@ -648,11 +730,13 @@
 			showPopUp: true,
 			async success() {
 				if (details.orderPackageCodeList.length === 0) return uni.showToast({
-					title: '没有需要下架的数据'
+					title: '没有需要下架的数据',
+					icon: 'none'
 				})
 
 				if (chooseOrderPackageCodeList.value.length === 0) return uni.showToast({
-					title: '最少选择一条需要下架的数据'
+					title: '最少选择一条需要下架的数据',
+					icon: 'none'
 				})
 
 				const submitData = {
@@ -671,33 +755,84 @@
 		})
 	}
 
-	/** 下架 -- 订单 -- 全选 */
-	const handleCheckAll = () => {
-		const _arr = []
+	/** 下架库位中零担 || 库存品 */
+	const handleDownLoadByStock = async (item : any) => {
+		const content = item.goodsType === 2 ? '零担下架' : '库存品下架'
+		details.stockItem = item
+		details.enterNum = item.shelfNum
 
-		for (let iterator of details.orderPackageCodeList) {
-			iterator.checked = true
-			_arr.push(iterator.code)
-		}
+		downLoadByStock.value.setDetails({
+			title: content,
+			showPopUp: true,
+			async success() {
+				let content = ''
 
-		chooseOrderPackageCodeList.value = _arr
-	}
+				if (!utils.isNumber(details.enterNum)) {
+					content = '请输入数字'
+				} else {
+					// 去除小数位
+					details.enterNum = Math.floor(details.enterNum)
 
-	/** 下架 -- 订单 -- 全部取消选择 */
-	const handleCloseCheck = () => {
-		chooseOrderPackageCodeList.value = []
+					if (details.enterNum <= 0) content = '请输入大于0的数量'
+					else if (details.enterNum > details.stockItem.shelfNum) content = '不能大于上架数量'
+				}
 
-		for (let iterator of details.orderPackageCodeList) {
-			iterator.checked = false
-		}
+				if (content) return uni.showToast({
+					title: content,
+					icon: 'none'
+				})
+
+				let res = {}
+
+				if (details.stockItem.goodsType === 2) {
+					// 零担下架
+					const data = {
+						upShelfZeroOrderList: [
+							{
+								waybillCode: details.stockItem.waybillNo,
+								orderCode: details.stockItem.orderCode,
+								enterNum: details.enterNum,
+								allocationId: details.allocationId,
+							}]
+					}
+					res = await warehouseUpdownTypedownZeroOrder(data)
+				} else {
+					// 
+					const data = {
+						upShelfStockList: [{
+							marketId: details.stockItem.marketId,
+							materialCode: details.stockItem.materialCode,
+							incomingBatch: details.stockItem.incomingBatch,
+							enterNum: details.enterNum,
+							allocationId: details.allocationId,
+						}]
+					}
+					res = await warehouseUpdownTypedownStock(data)
+				}
+
+				console.log('res :>> ', res);
+
+				if (res.code !== 200) return
+
+				details.scancode = details.allocationId
+				scandata()
+				downLoadByStock.value.details.showPopUp = false
+			}
+		})
 	}
 
-	/** 下架 -- 订单 -- 单个点击 */
-	const handleCheck = (item) => {
-		if (item.checked) chooseOrderPackageCodeList.value.splice(chooseOrderPackageCodeList.value.indexOf(item.code), 1)
-		else chooseOrderPackageCodeList.value.push(item.code)
+	const handleDownLoad = (item) => {
+		const { goodsType } = item
 
-		item.checked = !item.checked
+		if (goodsType === 0 || goodsType === 1) handleDownLoadByOrder(item)
+		else if (goodsType === 2) handleDownLoadByStock(item)
+		else if (goodsType === 3) handleDownLoadByStock(item)
+	}
+
+	/** 模拟 */
+	const moni = () => {
+		details.scancode = !details.allocationId ? '41793' : 'T46084'
+		scandata()
 	}
 
 	const {
@@ -1092,4 +1227,14 @@
 			border-radius: 10upx;
 		}
 	}
+
+	.mt10 {
+		margin-top: 20upx;
+	}
+
+	.flex-c-sb {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 </style>
\ No newline at end of file
diff --git a/utils/utils.js b/utils/utils.js
index 2d90147..bdd9d11 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -484,6 +484,10 @@ const utils = {
 				clearTimeout(timer);
 			}, delay);
 		})();
+	},
+	/** 是否为数字 */
+	isNumber(content) {
+		return !isNaN(parseFloat(content)) && isFinite(content);
 	}
 }
 export default utils
\ No newline at end of file