From 9b37d74d9e60a9117ff1611679682ecf2a3233ad Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 13 一月 2025 11:16:19 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/confirmProcessed.vue |   32 +++++++
 pages/phyz/checkLocDetl/locDetl.vue           |   14 ++-
 manifest.json                                 |    6 -
 pages/phyz/checkLocDetl/locDetl2.vue          |   11 +-
 pages/phyz/checkLocDetl/locDetlList.vue       |   49 ++++++++++-
 pages/phyz/checkLocDetl/locDetlList2.vue      |   48 ++++++++++-
 pages/phyz/stationManage/pickAgain.vue        |   28 ++++++
 7 files changed, 157 insertions(+), 31 deletions(-)

diff --git a/manifest.json b/manifest.json
index 65dca18..f795e1d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,12 +2,8 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-<<<<<<< HEAD
     "versionName" : "20250108A",
-=======
-    "versionName" : "20241128A",
->>>>>>> 248ef3ba3de9994dc83d2b36690542893f9fb6e6
-    "versionCode" : 136,
+    "versionCode" : 137,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
index 80b5a08..0717a80 100644
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ b/pages/phyz/checkLocDetl/locDetl.vue
@@ -11,7 +11,7 @@
 				<view>璐ф灦鐮侊細{{containerDetl.barcode}}</view>
 				<view>搴撳瓨鍝佺被锛歿{containerDetl.count}}</view>
 			</view>
-			<view class="list-right" @click="goToLocDetl(containerDetl)">
+			<view class="list-right" @click="goToLocDetl(containerDetl,'con')">
 				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 				<view>璐ф灦鐮侊細{{locDetl.barcode}}</view>
 				<view>搴撳瓨鍝佺被锛歿{locDetl.count}}</view>
 			</view>
-			<view class="list-right" @click="goToLocDetl(locDetl)">
+			<view class="list-right" @click="goToLocDetl(locDetl,'loc')">
 				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
 			</view>
 		</view>
@@ -122,7 +122,6 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
-						console.log(res);
 						if (res.code === 200) {
 							if (res.data.containerCode.length > 0) {
 								_this.dataList = res.data.containerCode
@@ -152,7 +151,7 @@
 					}
 				})
 			},
-			goToLocDetl(item) {
+			goToLocDetl(item,type) {
 				let _this = this
 				if (item.data.length <= 0) {
 					uni.showToast({ title: '娌℃湁搴撳瓨', icon: "error", position: 'top' })
@@ -162,8 +161,11 @@
 					url: "./locDetlList",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-						res.eventChannel.emit('item', {
-							item: item
+						// res.eventChannel.emit('item', {
+						// 	item: item
+						// })
+						res.eventChannel.emit('baseInfo', {
+							info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
 						})
 					},
 					events: {
diff --git a/pages/phyz/checkLocDetl/locDetl2.vue b/pages/phyz/checkLocDetl/locDetl2.vue
index 4ee29b7..5409778 100644
--- a/pages/phyz/checkLocDetl/locDetl2.vue
+++ b/pages/phyz/checkLocDetl/locDetl2.vue
@@ -11,7 +11,7 @@
 				<view>璐ф灦鐮侊細{{containerDetl.barcode}}</view>
 				<view>搴撳瓨鍝佺被锛歿{containerDetl.count}}</view>
 			</view>
-			<view class="list-right" @click="goToLocDetl(containerDetl)">
+			<view class="list-right" @click="goToLocDetl(containerDetl,'con')">
 				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 				<view>璐ф灦鐮侊細{{locDetl.barcode}}</view>
 				<view>搴撳瓨鍝佺被锛歿{locDetl.count}}</view>
 			</view>
-			<view class="list-right" @click="goToLocDetl(locDetl)">
+			<view class="list-right" @click="goToLocDetl(locDetl,'loc')">
 				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
 			</view>
 		</view>
@@ -162,8 +162,11 @@
 					url: "./locDetlList2",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-						res.eventChannel.emit('item', {
-							item: item
+						// res.eventChannel.emit('item', {
+						// 	item: item
+						// })
+						res.eventChannel.emit('baseInfo', {
+							info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
 						})
 					},
 					events: {
diff --git a/pages/phyz/checkLocDetl/locDetlList.vue b/pages/phyz/checkLocDetl/locDetlList.vue
index b1cf4ef..61c4e70 100644
--- a/pages/phyz/checkLocDetl/locDetlList.vue
+++ b/pages/phyz/checkLocDetl/locDetlList.vue
@@ -71,6 +71,7 @@
 				orderNo: '',
 				threeCode: '',
 				processSts$: '',
+				type: '',
 				processSts$List: ['寰呭姞宸�','宸插姞宸�','鏃犻渶鍔犲伐']
 			}
 		},
@@ -81,17 +82,51 @@
 			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('item', function(data) {
+			// eventChannel.on('item', function(data) {
+			// 	console.log(data);
+			// 	_this.locNo = data.item.locNo
+			// 	_this.barcode = data.item.barcode
+			// 	for (let k of data.item.data) {
+			// 		k['count'] = k.anfme
+			// 	}
+			// 	_this.dataList = data.item.data
+			// })
+			eventChannel.on('baseInfo', function(data) {
 				console.log(data);
-				_this.locNo = data.item.locNo
-				_this.barcode = data.item.barcode
-				for (let k of data.item.data) {
-					k['count'] = k.anfme
-				}
-				_this.dataList = data.item.data
+				_this.getLocDetl(data.info.locNo,data.info.barcode)
+				_this.locNo = data.info.locNo
+				_this.barcode = data.info.barcode
+				_this.type = data.info.type
 			})
 		},
 		methods: {
+			getLocDetl(locNo,barcode) {
+				let _this = this 
+				let param = {locNo:locNo,containerCode: barcode}
+				uni.request({
+					url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
+					header: {'token': uni.getStorageSync('token')},
+					data: param,
+					method: 'POST',
+					success(res) {
+						res = res.data
+						console.log(res);
+						if (res.code === 200) {
+							if (_this.type == 'con') {
+								_this.dataList = res.data.containerCode
+							} else {
+								_this.dataList = res.data.locNo
+							}
+							
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
 			add() {
 				let _this = this
 				uni.navigateTo({
diff --git a/pages/phyz/checkLocDetl/locDetlList2.vue b/pages/phyz/checkLocDetl/locDetlList2.vue
index 73783f1..987ff47 100644
--- a/pages/phyz/checkLocDetl/locDetlList2.vue
+++ b/pages/phyz/checkLocDetl/locDetlList2.vue
@@ -81,17 +81,51 @@
 			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('item', function(data) {
+			// eventChannel.on('item', function(data) {
+			// 	console.log(data);
+			// 	_this.locNo = data.item.locNo
+			// 	_this.barcode = data.item.barcode
+			// 	for (let k of data.item.data) {
+			// 		k['count'] = k.anfme
+			// 	}
+			// 	_this.dataList = data.item.data
+			// })
+			eventChannel.on('baseInfo', function(data) {
 				console.log(data);
-				_this.locNo = data.item.locNo
-				_this.barcode = data.item.barcode
-				for (let k of data.item.data) {
-					k['count'] = k.anfme
-				}
-				_this.dataList = data.item.data
+				_this.getLocDetl(data.info.locNo,data.info.barcode)
+				_this.locNo = data.info.locNo
+				_this.barcode = data.info.barcode
+				_this.type = data.info.type
 			})
 		},
 		methods: {
+			getLocDetl(locNo,barcode) {
+				let _this = this 
+				let param = {locNo:locNo,containerCode: barcode}
+				uni.request({
+					url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
+					header: {'token': uni.getStorageSync('token')},
+					data: param,
+					method: 'POST',
+					success(res) {
+						res = res.data
+						console.log(res);
+						if (res.code === 200) {
+							if (_this.type == 'con') {
+								_this.dataList = res.data.containerCode
+							} else {
+								_this.dataList = res.data.locNo
+							}
+							
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
 			add() {
 				let _this = this
 				uni.navigateTo({
diff --git a/pages/phyz/stationManage/confirmProcessed.vue b/pages/phyz/stationManage/confirmProcessed.vue
index 84b70a1..a855721 100644
--- a/pages/phyz/stationManage/confirmProcessed.vue
+++ b/pages/phyz/stationManage/confirmProcessed.vue
@@ -120,13 +120,43 @@
 			const eventChannel = this.getOpenerEventChannel();
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('item', function(data) {
+				console.log(data);
 				for (let k of data.item) {
 					k['maxCount'] = k.anfme
+					_this.getWrkDetl(k.wrkNo)
 				}
-				_this.dataList = require('lodash').cloneDeep(data.item)
+				// _this.dataList = require('lodash').cloneDeep(data.item)
 			})
 		},
 		methods: {
+			// 鑾峰彇宸ヤ綔鏄庣粏
+			getWrkDetl(wrkNo) {
+				let _this = this
+				uni.request({
+					url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
+					header: {'token': uni.getStorageSync('token')},
+					data: {
+						curr: 1,
+						limit: 1000,
+						wrk_no: wrkNo
+					},
+					method: 'GET',
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							for (let k of res.data.records) {
+								k['maxCount'] = k.anfme
+							}
+							_this.dataList = res.data.records
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
 			processed() {
 				this.$refs.process.open()
 			},
diff --git a/pages/phyz/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue
index 7c98e90..ec5d9b2 100644
--- a/pages/phyz/stationManage/pickAgain.vue
+++ b/pages/phyz/stationManage/pickAgain.vue
@@ -69,7 +69,7 @@
 				_this.pickList = data.wrkDetls
 				_this.wrkNo = data.wrkDetls[0].wrkNo
 				_this.locNo = data.item.sourceLocNo
-				_this.getLocDetl(data.item.sourceLocNo)
+				_this.getWrkDetl(data.wrkDetls[0].wrkNo)
 			})
 		},
 		methods: {
@@ -124,6 +124,32 @@
 					},
 				})
 			},
+			// 鑾峰彇宸ヤ綔鏄庣粏
+			getWrkDetl(wrkNo) {
+				let _this = this
+				uni.request({
+					url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
+					header: {'token': uni.getStorageSync('token')},
+					data: {
+						curr: 1,
+						limit: 1000,
+						wrk_no: wrkNo
+					},
+					method: 'GET',
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							_this.pickList = res.data.records
+							_this.getLocDetl(_this.locNo)
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
 			// 宸查�夋嫞鏂欏垪琛�
 			chosed(wrkDetls,locDetls) {
 				console.log(wrkDetls,locDetls);

--
Gitblit v1.9.1