From e94eeb788e6ff550c54becdf917bf756db7041d0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 11 一月 2025 16:56:38 +0800
Subject: [PATCH] #

---
 pages/pingku/POrderPakin.vue       |  567 +++++++++++++++++
 pages/stock/stockQuery.vue         |    6 
 pages/home/home.vue                |   37 
 pages/pingku/POrderDetlList.vue    |  132 ++++
 pages/pingku/POrderList.vue        |  246 +++++++
 pages/order/orderPakin2.vue        |    2 
 pages.json                         |   36 +
 pages/pingku/POrderPakinOut.vue    |  567 +++++++++++++++++
 pages/pingku/POrderDetlListOut.vue |  132 ++++
 pages/pingku/POrderListOut.vue     |  246 +++++++
 10 files changed, 1,956 insertions(+), 15 deletions(-)

diff --git a/pages.json b/pages.json
index 7bcfe3e..ac88efa 100644
--- a/pages.json
+++ b/pages.json
@@ -97,6 +97,42 @@
 			}
 		},
 		{
+			"path": "pages/pingku/POrderList",
+			"style": {
+				"navigationBarTitleText": "骞冲簱鍏ュ簱"
+			}
+		},
+		{
+			"path": "pages/pingku/POrderDetlList",
+			"style": {
+				"navigationBarTitleText": "璁㈠崟鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/pingku/POrderPakin",
+			"style": {
+				"navigationBarTitleText": "骞冲簱涓婃灦"
+			}
+		},
+		{
+			"path": "pages/pingku/POrderListOut",
+			"style": {
+				"navigationBarTitleText": "骞冲簱涓嬫灦"
+			}
+		},
+		{
+			"path": "pages/pingku/POrderDetlListOut",
+			"style": {
+				"navigationBarTitleText": "鍑哄簱璁㈠崟鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/pingku/POrderPakinOut",
+			"style": {
+				"navigationBarTitleText": "骞冲簱涓嬫灦"
+			}
+		},
+		{
 			"path": "pages/order/orderPutOn",
 			"style": {
 				"navigationBarTitleText": "璁㈠崟涓婃灦"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 12f5269..f99f4c7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,12 +24,19 @@
 				icon: '',
 				elements: [],
 				elements2: [
+					// {
+					// 	title: '缁勬墭',
+					// 	name: 'pakin',
+					// 	color: 'cyan',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pakin/pakin'
+					// },
 					{
-						title: '缁勬墭',
-						name: 'pakin',
-						color: 'cyan',
+						title: '璁㈠崟鍏ュ簱',
+						name: 'orderPakin',
+						color: 'red',
 						cuIcon: 'pullup',
-						url: '/pakin/pakin'
+						url: '/order/orderList'
 					},
 					{
 						title: '鎷ｆ枡绔欏埌绔�',
@@ -38,13 +45,21 @@
 						cuIcon: 'pullup',
 						url: '/pakin/leftovers'
 					},					
-					{
-						title: '璁㈠崟鍏ュ簱',
-						name: 'orderPakin',
-						color: 'red',
-						cuIcon: 'pullup',
-						url: '/order/orderList'
-					},
+					
+					// {
+					// 	title: '骞冲簱鍏ュ簱',
+					// 	name: 'POrderPakin',
+					// 	color: 'purple',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pingku/POrderList'
+					// },
+					// {
+					// 	title: '骞冲簱鍑哄簱',
+					// 	name: 'POrderPakin',
+					// 	color: 'cyan',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pingku/POrderListOut'
+					// },
 					{
 						title: '鍛煎彨Agv',
 						name: 'AGVStart',
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index 1849506..d372459 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -104,7 +104,7 @@
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.001' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
diff --git a/pages/pingku/POrderDetlList.vue b/pages/pingku/POrderDetlList.vue
new file mode 100644
index 0000000..b495685
--- /dev/null
+++ b/pages/pingku/POrderDetlList.vue
@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @input="search" />
+		</view>	
+		<view class="card" v-show="item.enableQty >0" v-for="item in menuList" @click="chose(item)">
+			<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+			<view class="tag-item">鐗╂枡鐮侊細 {{item.matnr}}</view>
+			<view class="tag-item">鐗╂枡鍚嶇О锛� {{item.maktx}}</view>
+			<view class="tag-item">瑙勬牸锛� {{item.specs}}</view>
+			<view class="tag-item">鎵规锛� {{item.batch}}</view>
+			<view class="tag-item">鏁伴噺锛� {{item.anfme}}</view>
+			<view class="tag-item">鍓╀綑鏁伴噺锛� {{item.enableQty}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				data:'',	
+				condition:'',
+				menuList: [],
+				order:'',
+				baseUrl: '',
+				token: '',
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('data', function(data) {
+				that.order = data.data
+				that.getOrderNoList(that.order)
+			});
+		},
+		onShow() {
+			let that = this
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			that.getOrderNoList(that.order)
+		},
+		methods: {
+			search(){
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/orderDetl/search/pda/auth',
+				    data: {
+						condition: that.condition,
+						order: that.order.orderNo
+				    },
+					// method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.menuList = res.data
+							// that.save()
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			getOrderNoList(order) {
+				let that = this
+				uni.request({
+					url: uni.getStorageSync('baseUrl') + '/orderDetl/list/pda/auth',
+					method: 'POST',
+					data: {						
+						orderNo: order.orderNo
+					},
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			chose(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pingku/POrderPakin",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('orderItem', {
+							item: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							// that.input(that.matnr)
+						},
+					},
+				
+				
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.card {
+		margin: 20rpx;
+		padding: 30rpx;
+		background-color: #157ec1;
+		border-radius: 20rpx;
+		color: #FFF;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #ffffff;
+		font-size: 14px;
+	}
+</style>
diff --git a/pages/pingku/POrderDetlListOut.vue b/pages/pingku/POrderDetlListOut.vue
new file mode 100644
index 0000000..8668373
--- /dev/null
+++ b/pages/pingku/POrderDetlListOut.vue
@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @input="search" />
+		</view>	
+		<view class="card" v-show="item.enableQty >0" v-for="item in menuList" @click="chose(item)">
+			<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+			<view class="tag-item">鐗╂枡鐮侊細 {{item.matnr}}</view>
+			<view class="tag-item">鐗╂枡鍚嶇О锛� {{item.maktx}}</view>
+			<view class="tag-item">瑙勬牸锛� {{item.specs}}</view>
+			<view class="tag-item">鎵规锛� {{item.batch}}</view>
+			<view class="tag-item">鏁伴噺锛� {{item.anfme}}</view>
+			<view class="tag-item">鍓╀綑鏁伴噺锛� {{item.enableQty}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				data:'',	
+				condition:'',
+				menuList: [],
+				order:'',
+				baseUrl: '',
+				token: '',
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('data', function(data) {
+				that.order = data.data
+				that.getOrderNoList(that.order)
+			});
+		},
+		onShow() {
+			let that = this
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			that.getOrderNoList(that.order)
+		},
+		methods: {
+			search(){
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/orderDetl/search/pda/auth',
+				    data: {
+						condition: that.condition,
+						order: that.order.orderNo
+				    },
+					// method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.menuList = res.data
+							// that.save()
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			getOrderNoList(order) {
+				let that = this
+				uni.request({
+					url: uni.getStorageSync('baseUrl') + '/orderDetl/list/pda/auth',
+					method: 'POST',
+					data: {						
+						orderNo: order.orderNo
+					},
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			chose(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pingku/POrderPakinOut",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('orderItem', {
+							item: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							// that.input(that.matnr)
+						},
+					},
+				
+				
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.card {
+		margin: 20rpx;
+		padding: 30rpx;
+		background-color: #157ec1;
+		border-radius: 20rpx;
+		color: #FFF;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #ffffff;
+		font-size: 14px;
+	}
+</style>
diff --git a/pages/pingku/POrderList.vue b/pages/pingku/POrderList.vue
new file mode 100644
index 0000000..481c8d0
--- /dev/null
+++ b/pages/pingku/POrderList.vue
@@ -0,0 +1,246 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+		</view>		
+		<view>
+			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+					</view>
+				</view>
+				<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+				<view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
+				<view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+				<view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
+			</view>
+		</view>
+		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tagList: [],
+				matList: [],
+				condition: '',
+				reload: false,
+				curr:1,
+				tag: '鍒嗙被',
+				baColor: "background-color: #0081ff;",
+				desc: '鍟嗗搧缂栧彿:',
+				baseUrl: '',
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+				// 褰撳墠tagId
+				tagIdNow: 1,
+				
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			this.showMat(this.tagIdNow);
+		},
+		onLoad() {
+			// 娌″暐鐢ㄤ簡
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('commonUrl', function(data) {
+				that.commonUrl = data.commonUrl
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.showMat(1)
+		},
+		methods: {
+			search() {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/order/search/pda/auth',
+				    data: {
+						condition: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.matList = res.data
+							// that.save()
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			showTag(parentId) {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/tag/list/pda/auth',
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+				    data: {
+						limit: 100000,
+						parentId: parentId
+				    },
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+					success(result) {
+						that.tagList = null
+						that.matList = []
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data != null && res.data.length > 0) {
+								that.tagList = res.data
+							} else {
+								that.showMat(parentId)
+							}
+							that.baColor = "background-color: #0081ff;"
+						} else if (res.code === 403 ) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			showMat(tagId) {
+				let that = this				
+				// wms绔� 琛ユ帴鍙�
+				// @RequestMapping(value = "/mat/list/pda/page/auth")
+				// @ManagerAuth
+				// public R pdaPageList(@RequestParam(required = true)Long tagId,
+				// 					 @RequestParam(defaultValue = "1")Integer curr,
+				// 					 @RequestParam(defaultValue = "10")Integer limit){
+				// 	EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+				// 	wrapper.eq("tag_id", tagId);
+				// 	wrapper.orderBy("create_time", false);
+				// 	return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+				// }
+				uni.request({
+				    url: that.baseUrl + '/order/list/pda/page/auth',
+				    data: {
+						curr:that.curr,
+						limit: 100,
+						tagId: tagId
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						that.tagList = null
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data.records != null && res.data.records.length > 0) {
+								let list = res.data.records
+								that.matList = that.reload ? list : that.matList.concat(list);
+								that.curr = that.curr + 1
+							}
+							if (res.data.records.length == 0) {
+								that.status = 'noMore'
+							}
+							that.baColor = "background-color: #1cbbb4;"
+						} else if (res.code === 403 ) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+						
+					}
+				});
+			},
+			toPrint(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pingku/POrderDetlList",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('data', {
+							data: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+				
+				
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.tag-list {
+		width: 94%;
+		min-height: 160rpx;
+		margin: 10px auto;
+		background-color: #FFF;
+		border-radius: 5px;
+		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	}
+	.tag {
+		display: flex;
+		flex-direction: column;
+		min-height: 80rpx;
+		border-bottom: 1px solid #e2e2e2;
+	}
+	.wms-tag {
+		min-width: 60rpx;
+		margin-left: 50rpx;
+		margin-top: 30rpx;
+		color: #FFF;
+		font-size: 14px;
+		padding: 4rpx 12rpx;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #606266;
+		font-size: 14px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/pingku/POrderListOut.vue b/pages/pingku/POrderListOut.vue
new file mode 100644
index 0000000..f6e0b43
--- /dev/null
+++ b/pages/pingku/POrderListOut.vue
@@ -0,0 +1,246 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+		</view>		
+		<view>
+			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+					</view>
+				</view>
+				<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+				<view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
+				<view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+				<view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
+			</view>
+		</view>
+		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tagList: [],
+				matList: [],
+				condition: '',
+				reload: false,
+				curr:1,
+				tag: '鍒嗙被',
+				baColor: "background-color: #0081ff;",
+				desc: '鍟嗗搧缂栧彿:',
+				baseUrl: '',
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+				// 褰撳墠tagId
+				tagIdNow: 1,
+				
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			this.showMat(this.tagIdNow);
+		},
+		onLoad() {
+			// 娌″暐鐢ㄤ簡
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('commonUrl', function(data) {
+				that.commonUrl = data.commonUrl
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.showMat(1)
+		},
+		methods: {
+			search() {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/order/search/pda/auth',
+				    data: {
+						condition: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.matList = res.data
+							// that.save()
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			showTag(parentId) {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/tag/list/pda/auth',
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+				    data: {
+						limit: 100000,
+						parentId: parentId
+				    },
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+					success(result) {
+						that.tagList = null
+						that.matList = []
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data != null && res.data.length > 0) {
+								that.tagList = res.data
+							} else {
+								that.showMat(parentId)
+							}
+							that.baColor = "background-color: #0081ff;"
+						} else if (res.code === 403 ) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				});
+			},
+			showMat(tagId) {
+				let that = this				
+				// wms绔� 琛ユ帴鍙�
+				// @RequestMapping(value = "/mat/list/pda/page/auth")
+				// @ManagerAuth
+				// public R pdaPageList(@RequestParam(required = true)Long tagId,
+				// 					 @RequestParam(defaultValue = "1")Integer curr,
+				// 					 @RequestParam(defaultValue = "10")Integer limit){
+				// 	EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+				// 	wrapper.eq("tag_id", tagId);
+				// 	wrapper.orderBy("create_time", false);
+				// 	return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+				// }
+				uni.request({
+				    url: that.baseUrl + '/order/list/pda/page/out/auth',
+				    data: {
+						curr:that.curr,
+						limit: 100,
+						tagId: tagId
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						that.tagList = null
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data.records != null && res.data.records.length > 0) {
+								let list = res.data.records
+								that.matList = that.reload ? list : that.matList.concat(list);
+								that.curr = that.curr + 1
+							}
+							if (res.data.records.length == 0) {
+								that.status = 'noMore'
+							}
+							that.baColor = "background-color: #1cbbb4;"
+						} else if (res.code === 403 ) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+						
+					}
+				});
+			},
+			toPrint(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pingku/POrderDetlListOut",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('data', {
+							data: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+				
+				
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.tag-list {
+		width: 94%;
+		min-height: 160rpx;
+		margin: 10px auto;
+		background-color: #FFF;
+		border-radius: 5px;
+		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	}
+	.tag {
+		display: flex;
+		flex-direction: column;
+		min-height: 80rpx;
+		border-bottom: 1px solid #e2e2e2;
+	}
+	.wms-tag {
+		min-width: 60rpx;
+		margin-left: 50rpx;
+		margin-top: 30rpx;
+		color: #FFF;
+		font-size: 14px;
+		padding: 4rpx 12rpx;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #606266;
+		font-size: 14px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/pingku/POrderPakin.vue b/pages/pingku/POrderPakin.vue
new file mode 100644
index 0000000..a4ec86a
--- /dev/null
+++ b/pages/pingku/POrderPakin.vue
@@ -0,0 +1,567 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<view style="flex: 1;">
+					<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus">
+				</view>
+				
+			</view>
+			<view class="item">
+				<view class="code-decs">搴撲綅鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="barcodeFocus"
+					>
+			</view>
+			<view class="item">
+				<view class="code-decs">鐗╂枡鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<!-- <view class="item-right">
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons>
+				</view> -->
+			</view>
+		</view>
+		<view class="mat-list-title">
+			鍟嗗搧鍒楄〃
+		</view>
+		<scroll-view>
+			<view class="list" v-for="(item,i) in dataList" :key="i">
+				<view class="list-left">
+					<view class="list-left-item">
+						<view class="desc">No锛�</view>
+						<view class="left-item">{{i + 1}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">缂栫爜锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+						</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍝佸悕锛�</view>
+						<view class="left-item">{{item.maktx}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">瑙勬牸锛�</view>
+						<view class="left-item">{{item.specs}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鎵瑰彿锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.batch" type="warning"></uni-tag>
+						</view>
+					</view>
+					<!-- <view class="list-left-item">
+						<view class="desc">閲嶉噺锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.weight" type="warning"></uni-tag>
+						</view>
+					</view> -->
+					<view class="list-left-item">
+						<view class="desc">鏁伴噺锛�</view>
+						<view class="left-item">{{item.anfme}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鐘舵�侊細</view>
+						<view class="left-item">{{item.review}}</view>
+					</view>
+				</view>
+				<view class="list-right">
+					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">涓婃灦</button>
+		</view>
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<view>
+			<uni-popup ref="revise" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">淇敼</view>
+					<view class="popup-item">
+						<view class="popup-item-left">缂栫爜:</view>
+						<view class="popup-item-right">
+							<input type="text" v-model="matnr" disabled="true"
+								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+						</view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鎵瑰彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="batch"></view>
+					</view>
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
+					</view> -->
+					<view class="popup-item">
+						<view class="popup-item-left">鏁伴噺:</view>
+						<view class="popup-item-right" style="border: none;justify-content: center;">
+							<uni-number-box :value="count" :step='0.001' :max="9999999" color="#747474" @change="changeValue" />
+						</view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
+						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绉婚櫎纭 -->
+		<view>
+			<!-- 鎻愮ず绐楃ず渚� -->
+			<uni-popup ref="alertDialog" type="dialog">
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+		<!-- 纭缁勬墭 -->
+		<view>
+			<uni-popup ref="combConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<!-- 纭閲嶇疆 -->
+		<view>
+			<uni-popup ref="resetConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				orderNo: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				orderNoFocus: false,
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				locNo:""
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = this.getOpenerEventChannel();
+			
+			eventChannel.on('orderItem', function(data) {
+				console.log(data.item)
+				that.orderNo = data.item.orderNo
+				that.checkMat(data.item)
+			});
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			clearOrderNo() {
+				this.orderNo = ''
+				let that = this;
+				that.orderNoFocus = false;
+				setTimeout(() => {
+					that.orderNo = '';
+					that.orderNoFocus = true;
+				}, 100);
+			},
+			orderNoInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.orderNo.length
+					this.barcodeFocuss()
+				}, 200)
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len >= 9 && len <=8) {
+						uni.showToast({
+							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						this.barcodeFocuss()
+						return;
+					}
+					this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				this.focus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				let m = that.matnr.split(";")
+				let matnr1 = m[0].slice(3)
+				for(var i = 0;i<that.dataList.length;i++){
+					if(that.dataList[i].matnr === matnr1){
+						that.dataList[i].review = "宸插鏍�"
+					}
+					 
+				}
+				setTimeout(() => {
+					this.matnr = '';					
+				}, 100);
+				// uni.request({
+				// 	url: that.baseUrl + '/mat/auth',
+				// 	data: {
+				// 		matnr: matnr1
+				// 	},
+				// 	header: {
+				// 		'token': uni.getStorageSync('token')
+				// 	},
+				// 	success(result) {
+				// 		result = result.data
+				// 		if (result.code === 200 && result.data) {
+				// 			that.matData = result.data
+				// 			that.matnr = ''
+				// 			that.matData['batch'] = ''
+				// 			uni.navigateTo({
+				// 				url: "../mat/matSelected",
+				// 				// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+				// 				success: function(res) {
+				// 					res.eventChannel.emit('mat', {
+				// 						data: result.data
+				// 					})
+				// 				},
+				// 				// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+				// 				events: {
+				// 					matList: function(data) {
+				// 						that.checkMat(data.data)
+				// 						that.focuss()
+				// 					},
+				// 				},
+				// 			});
+				// 		} else if (result.code == 403) {
+				// 			uni.showToast({
+				// 				title: result.msg,
+				// 				icon: "none",
+				// 				position: 'top'
+				// 			})
+				// 			setTimeout(() => {
+				// 				uni.reLaunch({
+				// 					url: '../login/login'
+				// 				});
+				// 			}, 1000);
+				// 		} else {
+				// 			uni.showToast({
+				// 				title: result.msg,
+				// 				icon: "none",
+				// 				position: 'top'
+				// 			})
+				// 		}
+
+				// 	}
+				// });
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../mat/matQuery",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				mat.review = "鏈鏍�"
+				var len = this.dataList.length
+				var add = true ,sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.matnr == this.dataList[i].matnr) {
+						for (var j = 0; j < len; j++) {
+							if (mat.batch == this.dataList[j].batch) {
+								sameItem = true
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							this.dataList[i].anfme += mat.anfme
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr
+				this.count = this.dataList[i].anfme
+				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.removeNum  = i
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm() {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+			reviseConfirm() {
+				this.dataList[this.rowNum].anfme = this.count
+				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
+				this.matnr = ''
+				this.messageText = "淇敼鎴愬姛"
+				this.messageToggle('success')
+				this.$refs.revise.close()
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				this.count = value
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪涓婃灦!'
+				this.$refs.combConfirm.open()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.orderNo === '') {
+					this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.locNo === '') {
+					this.messageText = "璇锋壂鎻忓簱浣嶇爜"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				// for (var i = 0; i < that.dataList.length; i++) {
+				// 	if (that.dataList[i].review !== "宸插鏍�" ) {
+				// 		this.messageText = that.dataList[i].matnr + '鏈鏍�'
+				// 		this.messageToggle('error')
+				// 		return;
+				// 	}
+				// 	if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+				// 		this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+				// 		this.messageToggle('error')
+				// 		return;
+				// 	}				
+					
+				// }
+				uni.request({
+					url: that.baseUrl + '/mobile/pingKu/Shelves/auth',
+					data: JSON.stringify({
+						orderNo: that.orderNo,
+						locno: that.locNo,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.resst();
+							that.messageText = "涓婃灦鎴愬姛"
+							that.messageToggle('success')							
+						} else if (res.code == 403) {
+							that.messageText = res.msg
+							that.messageToggle('error')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.orderNo = ''
+				this.dataList = []
+				this.locNo = ''
+				let that = this;
+				that.orderNoFocus = false;
+				setTimeout(() => {
+					that.orderNo = '';
+					that.orderNoFocus = true;
+				}, 100);
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		margin-left: 20rpx;
+		border-bottom: 1px solid #DCDFE6;
+	}
+
+	.item input {
+		height: 50rpx;
+		line-height: 50rpx;
+		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+		font-size: 36upx;
+		font-family: PingFang SC;
+		width: 55vw;
+
+	}
+
+	.code-decs {
+		width: 20vw;
+		font-size: 18px;
+		color: #303133;
+	}
+
+	.item-right {
+		margin-left: auto;
+		margin-right: 20rpx;
+	}
+
+	.mat-list-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 300rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+	}
+</style>
diff --git a/pages/pingku/POrderPakinOut.vue b/pages/pingku/POrderPakinOut.vue
new file mode 100644
index 0000000..afb25d5
--- /dev/null
+++ b/pages/pingku/POrderPakinOut.vue
@@ -0,0 +1,567 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<view style="flex: 1;">
+					<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus">
+				</view>
+				
+			</view>
+			<view class="item">
+				<view class="code-decs">搴撲綅鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="barcodeFocus"
+					>
+			</view>
+			<view class="item">
+				<view class="code-decs">鐗╂枡鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<!-- <view class="item-right">
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons>
+				</view> -->
+			</view>
+		</view>
+		<view class="mat-list-title">
+			鍟嗗搧鍒楄〃
+		</view>
+		<scroll-view>
+			<view class="list" v-for="(item,i) in dataList" :key="i">
+				<view class="list-left">
+					<view class="list-left-item">
+						<view class="desc">No锛�</view>
+						<view class="left-item">{{i + 1}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">缂栫爜锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+						</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍝佸悕锛�</view>
+						<view class="left-item">{{item.maktx}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">瑙勬牸锛�</view>
+						<view class="left-item">{{item.specs}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鎵瑰彿锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.batch" type="warning"></uni-tag>
+						</view>
+					</view>
+					<!-- <view class="list-left-item">
+						<view class="desc">閲嶉噺锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.weight" type="warning"></uni-tag>
+						</view>
+					</view> -->
+					<view class="list-left-item">
+						<view class="desc">鏁伴噺锛�</view>
+						<view class="left-item">{{item.anfme}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鐘舵�侊細</view>
+						<view class="left-item">{{item.review}}</view>
+					</view>
+				</view>
+				<view class="list-right">
+					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">涓嬫灦</button>
+		</view>
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<view>
+			<uni-popup ref="revise" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">淇敼</view>
+					<view class="popup-item">
+						<view class="popup-item-left">缂栫爜:</view>
+						<view class="popup-item-right">
+							<input type="text" v-model="matnr" disabled="true"
+								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+						</view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鎵瑰彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="batch"></view>
+					</view>
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
+					</view> -->
+					<view class="popup-item">
+						<view class="popup-item-left">鏁伴噺:</view>
+						<view class="popup-item-right" style="border: none;justify-content: center;">
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+						</view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
+						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绉婚櫎纭 -->
+		<view>
+			<!-- 鎻愮ず绐楃ず渚� -->
+			<uni-popup ref="alertDialog" type="dialog">
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+		<!-- 纭缁勬墭 -->
+		<view>
+			<uni-popup ref="combConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<!-- 纭閲嶇疆 -->
+		<view>
+			<uni-popup ref="resetConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				orderNo: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				orderNoFocus: false,
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				locNo:""
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = this.getOpenerEventChannel();
+			
+			eventChannel.on('orderItem', function(data) {
+				console.log(data.item)
+				that.orderNo = data.item.orderNo
+				that.checkMat(data.item)
+			});
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			clearOrderNo() {
+				this.orderNo = ''
+				let that = this;
+				that.orderNoFocus = false;
+				setTimeout(() => {
+					that.orderNo = '';
+					that.orderNoFocus = true;
+				}, 100);
+			},
+			orderNoInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.orderNo.length
+					this.barcodeFocuss()
+				}, 200)
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len >= 9 && len <=8) {
+						uni.showToast({
+							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						this.barcodeFocuss()
+						return;
+					}
+					this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				this.focus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				let m = that.matnr.split(";")
+				let matnr1 = m[0].slice(3)
+				for(var i = 0;i<that.dataList.length;i++){
+					if(that.dataList[i].matnr === matnr1){
+						that.dataList[i].review = "宸插鏍�"
+					}
+					 
+				}
+				setTimeout(() => {
+					this.matnr = '';					
+				}, 100);
+				// uni.request({
+				// 	url: that.baseUrl + '/mat/auth',
+				// 	data: {
+				// 		matnr: matnr1
+				// 	},
+				// 	header: {
+				// 		'token': uni.getStorageSync('token')
+				// 	},
+				// 	success(result) {
+				// 		result = result.data
+				// 		if (result.code === 200 && result.data) {
+				// 			that.matData = result.data
+				// 			that.matnr = ''
+				// 			that.matData['batch'] = ''
+				// 			uni.navigateTo({
+				// 				url: "../mat/matSelected",
+				// 				// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+				// 				success: function(res) {
+				// 					res.eventChannel.emit('mat', {
+				// 						data: result.data
+				// 					})
+				// 				},
+				// 				// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+				// 				events: {
+				// 					matList: function(data) {
+				// 						that.checkMat(data.data)
+				// 						that.focuss()
+				// 					},
+				// 				},
+				// 			});
+				// 		} else if (result.code == 403) {
+				// 			uni.showToast({
+				// 				title: result.msg,
+				// 				icon: "none",
+				// 				position: 'top'
+				// 			})
+				// 			setTimeout(() => {
+				// 				uni.reLaunch({
+				// 					url: '../login/login'
+				// 				});
+				// 			}, 1000);
+				// 		} else {
+				// 			uni.showToast({
+				// 				title: result.msg,
+				// 				icon: "none",
+				// 				position: 'top'
+				// 			})
+				// 		}
+
+				// 	}
+				// });
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../mat/matQuery",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				mat.review = "鏈鏍�"
+				var len = this.dataList.length
+				var add = true ,sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.matnr == this.dataList[i].matnr) {
+						for (var j = 0; j < len; j++) {
+							if (mat.batch == this.dataList[j].batch) {
+								sameItem = true
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							this.dataList[i].anfme += mat.anfme
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr
+				this.count = this.dataList[i].anfme
+				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.removeNum  = i
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm() {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+			reviseConfirm() {
+				this.dataList[this.rowNum].anfme = this.count
+				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
+				this.matnr = ''
+				this.messageText = "淇敼鎴愬姛"
+				this.messageToggle('success')
+				this.$refs.revise.close()
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				this.count = value
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪涓嬫灦!'
+				this.$refs.combConfirm.open()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.orderNo === '') {
+					this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.locNo === '') {
+					this.messageText = "璇锋壂鎻忓簱浣嶇爜"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				// for (var i = 0; i < that.dataList.length; i++) {
+				// 	if (that.dataList[i].review !== "宸插鏍�" ) {
+				// 		this.messageText = that.dataList[i].matnr + '鏈鏍�'
+				// 		this.messageToggle('error')
+				// 		return;
+				// 	}
+				// 	if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+				// 		this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+				// 		this.messageToggle('error')
+				// 		return;
+				// 	}				
+					
+				// }
+				uni.request({
+					url: that.baseUrl + '/mobile/pingKu/unShelves/auth',
+					data: JSON.stringify({
+						orderNo: that.orderNo,
+						locno: that.locNo,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.resst();
+							that.messageText = "涓嬫灦鎴愬姛"
+							that.messageToggle('success')							
+						} else if (res.code == 403) {
+							that.messageText = res.msg
+							that.messageToggle('error')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.orderNo = ''
+				this.dataList = []
+				this.locNo = ''
+				let that = this;
+				that.orderNoFocus = false;
+				setTimeout(() => {
+					that.orderNo = '';
+					that.orderNoFocus = true;
+				}, 100);
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		margin-left: 20rpx;
+		border-bottom: 1px solid #DCDFE6;
+	}
+
+	.item input {
+		height: 50rpx;
+		line-height: 50rpx;
+		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+		font-size: 36upx;
+		font-family: PingFang SC;
+		width: 55vw;
+
+	}
+
+	.code-decs {
+		width: 20vw;
+		font-size: 18px;
+		color: #303133;
+	}
+
+	.item-right {
+		margin-left: auto;
+		margin-right: 20rpx;
+	}
+
+	.mat-list-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 300rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+	}
+</style>
diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 2270073..998a932 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -49,10 +49,10 @@
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">搴撲綅鍙凤細</view>
 						<view class="left-item">{{item.locNo}}</view>
-					</view>
+					</view> -->
 				</view>
 				<!-- <view class="list-right">
 					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
@@ -105,7 +105,7 @@
 			search() {
 				let that = this
 				uni.request({
-					url: that.baseUrl + '/locDetl/list/auth',
+					url: that.baseUrl + '/manLocDetl/list/auth',
 					header:{'token':uni.getStorageSync('token')},
 					data: {
 						curr: 1,

--
Gitblit v1.9.1