From 16b692b3ea44779cd15f730b5376ef12b39a9e13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 15:06:44 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/phyz/stationManage/stationDetl.vue | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 134 insertions(+), 21 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 2d13aed..7cf1817 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -19,11 +19,12 @@
<!-- 宸ヤ綔妗� -->
<view class="wrkMast" v-if="wrkMast">
<view class="wrkMast-wrkNo">
- <view style="flex:3">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
- <view style="flex:2;text-align: right;">{{wrkMast.ioTitle}}</view>
+ <view style="flex:5">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
+ <view style="flex:3;text-align: right;">{{wrkMast.ioTitle}}</view>
</view>
<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
+ <view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
</view>
<!-- 鏄庣粏 -->
@@ -76,6 +77,60 @@
<!-- 寮圭獥 -->
<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="doContainerMoveOut2" 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="containerMoveOut2()">纭绂诲満</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,9 +159,10 @@
<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="startPakin()" v-if="btnType == 'start' && station.locSts == 'F'">鍚姩鍏ュ簱</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">瀹瑰櫒绂诲満</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
+ <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
+ <button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
</view>
</view>
</template>
@@ -115,6 +171,8 @@
export default {
data() {
return {
+ baseUrl: '',
+ token: '',
station: null,
reload: {
loading: false,
@@ -157,7 +215,6 @@
success(res) {
res = res.data
if (res.code === 200) {
-
if (res.data.records[0].locSts == 'O') {
_this.btnType = 'emptyPakin'
} else if (res.data.records[0].locSts == 'F') {
@@ -165,6 +222,15 @@
} else {
_this.btnType = 'working'
}
+ // if (res.data.records[0].locSts == 'O') {
+ // res.data.records[0].locSts$ = '娌℃湁璐ф灦'
+ // } else if (res.data.records[0].locSts == 'F') {
+ // res.data.records[0].locSts$ = '璐ф灦鍦ㄥ簱'
+ // } else if (res.data.records[0].locSts == 'S') {
+ // res.data.records[0].locSts$ = '璐ф灦杩涘叆涓�'
+ // } else if (res.data.records[0].locSts == 'R') {
+ // res.data.records[0].locSts$ = '璐ф灦绂诲紑涓�'
+ // }
setTimeout(()=>{
for (let k of res.data.records) {
@@ -179,11 +245,11 @@
_this.reload.loadingText = '鏇存柊鐘舵��'
_this.getContainerType()
},500)
-
_this.getWrkMast(res.data.records[0].barcode)
+ uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -208,7 +274,7 @@
_this.reloadStation()
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -247,7 +313,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -281,7 +347,7 @@
uni.showToast({ title: '鍛煎彨鎴愬姛', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -301,7 +367,7 @@
_this.selects = res.data
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -363,7 +429,7 @@
}
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -388,7 +454,7 @@
_this.wrkDetls = res.data.records
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -414,7 +480,7 @@
_this.btnType = 'start'
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -422,9 +488,15 @@
})
},
// 鍏ㄦ澘鍑哄簱 纭鍑哄簱
+ doContainerMoveOut() {
+ this.$refs.doContainerMoveOut.open()
+ },
+ containerMoveOutClose() {
+ 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 +504,7 @@
success(res) {
res = res.data
if (res.code === 200) {
+ _this.$refs.doContainerMoveOut.close()
setTimeout(()=> {
_this.barcode = ''
_this.reloadStation()
@@ -439,7 +512,40 @@
uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
+ },
+
+ // 鍏ㄦ澘鍑哄簱 瀹瑰櫒绂诲満
+ doContainerMoveOut2() {
+ this.$refs.doContainerMoveOut2.open()
+ },
+ containerMoveOutClose() {
+ this.$refs.doContainerMoveOut2.close()
+ },
+ containerMoveOut2() {
+ let _this = this
+ let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
+ uni.request({
+ url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut2`,
+ data: JSON.stringify(devNo),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.$refs.doContainerMoveOut2.close()
+ setTimeout(()=> {
+ _this.barcode = ''
+ _this.reloadStation()
+ },1000)
+ uni.showToast({ title: '绂诲満瀹屾垚', icon: "success", position: 'top' })
+ } 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' })
}
@@ -447,20 +553,27 @@
})
},
// 鎷ｆ枡鍑哄簱 纭鍚庡洖搴�
+ 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) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -488,7 +601,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -534,7 +647,7 @@
padding: 24rpx;
}
.wrkMast-wrkNo {
- font-size: 32px;
+ font-size: 30px;
font-weight: bold;
padding: 24rpx 0;
display: flex;
--
Gitblit v1.9.1