From 511b8af3cb7c35793017733d34f4a7012b52f6bf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 08 四月 2024 14:23:43 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 manifest.json                            |    2 +-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 12b3889..454b31b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "20240407A",
+    "versionName" : "20240407B",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 2d13aed..540a9be 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -76,6 +76,42 @@
 		
 		<!-- 寮圭獥 -->
 		<view>
+			<uni-popup ref="doContainerMoveOut" 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="barcode"></view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
+						<view class="btn-right" @click="containerMoveOut()">鍏ュ簱</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="doPickIn" 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="barcode"></view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="pickInClose">鍙栨秷</view>
+						<view class="btn-right" @click="pickIn()">鍏ュ簱</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+		<!-- 寮圭獥 -->
+		<view>
 			<uni-popup ref="emptyOut" type="dialog">
 				<view class="popup">
 					<!-- 鏍囬 -->
@@ -104,8 +140,8 @@
 		<view class="buttom">
 			<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
 			<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
-			<button size="mini" type="primary" @click="containerMoveOut()" v-if="btnType == 'out' && station.locSts == 'F'">纭鍑哄簱</button>
-			<button size="mini" type="primary" @click="pickIn()" v-if="btnType == 'pick' && station.locSts == 'F'">宸叉嫞鏂欏洖搴�</button>
+			<button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out' && station.locSts == 'F'">纭鍑哄簱</button>
+			<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick' && station.locSts == 'F'">宸叉嫞鏂欏洖搴�</button>
 			<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start' && station.locSts == 'F'">鍚姩鍏ュ簱</button>
 		</view>
 	</view>
@@ -422,9 +458,15 @@
 				})
 			},
 			// 鍏ㄦ澘鍑哄簱 纭鍑哄簱
+			doContainerMoveOut() {
+				this.$refs.doContainerMoveOut.open()
+			},
+			containerMoveOutC() {
+				this.$refs.doContainerMoveOut.close()
+			},
 			containerMoveOut() {
 				let _this = this
-				let devNo = {devNo:[this.station.devNo]}
+				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
 					data: JSON.stringify(devNo),
@@ -432,6 +474,7 @@
 					success(res) {
 						res = res.data
 						if (res.code === 200) {
+							this.$refs.doContainerMoveOut.close()
 							setTimeout(()=> {
 								_this.barcode = ''
 								_this.reloadStation()
@@ -447,15 +490,22 @@
 				})
 			},
 			// 鎷ｆ枡鍑哄簱 纭鍚庡洖搴�
+			doPickIn() {
+				this.$refs.doPickIn.open()
+			},
+			pickInClose() {
+				this.$refs.doPickIn.close()
+			},
 			pickIn() {
 				let _this = this
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
-					data: {devNo: _this.station.devNo},
+					data: {devNo: _this.station.devNo,barcode: _this.barcode},
 					method: 'POST',
 					success(res) {
 						res = res.data 
 						if (res.code === 200) {
+							_this.$refs.doPickIn.close()
 							_this.barcode = ''
 							_this.reloadStation()
 						} else if (res.code == 403) {

--
Gitblit v1.9.1