From c03369d5d964be137b621198e7a5a506c87fa33c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 18 五月 2024 08:45:27 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/phyz/stationManage/stationDetl.vue | 114 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 17 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index e966559..0292fd0 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -36,7 +36,7 @@
<view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
<view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
<view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
- <view>鍑哄簱鏁伴噺:{{wrkDetl.anfme}}</view>
+ <view>浣滀笟鏁伴噺:{{wrkDetl.anfme}}</view>
</view>
</view>
@@ -81,7 +81,7 @@
<uni-popup ref="doContainerMoveOut" type="dialog">
<view class="popup">
<!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
+ <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>
@@ -124,7 +124,7 @@
</view>
<view class="btn">
<view class="btn-left" @click="pickInClose">鍙栨秷</view>
- <view class="btn-right" @click="pickIn()">鍏ュ簱</view>
+ <view class="btn-right" @click="pickIn()">纭鎷ｆ枡</view>
</view>
</view>
</uni-popup>
@@ -153,6 +153,23 @@
</uni-popup>
</view>
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="allocationIn" 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="allocationInConfirm()">纭杩涘満</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
@@ -165,6 +182,8 @@
<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
<button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷ｆ枡</button>
<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
+ <button size="mini" type="primary" @click="allocationOut()" v-if="btnType == 'allocationOut'">璋冩嫧绂诲満</button>
+ <button size="mini" type="primary" @click="allocationIn()" v-if="btnType == 'allocationIn'">璋冩嫧杩涘満</button>
</view>
</view>
</template>
@@ -218,21 +237,16 @@
res = res.data
if (res.code === 200) {
if (res.data.records[0].locSts == 'O') {
- _this.btnType = 'emptyPakin'
+ if (res.data.records[0].devNo.substring(0, 2) == "DB") {
+ _this.btnType = 'allocationIn'
+ } else {
+ _this.btnType = 'emptyPakin'
+ }
} else if (res.data.records[0].locSts == 'F') {
_this.btnType = 'pakin'
} 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) {
@@ -415,6 +429,9 @@
_this.btnType = 'pick'
} else if (wrkMast.ioType == 110) {
wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
+ } else if (wrkMast.ioType == 111) {
+ wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
+ _this.btnType = 'allocationOut'
}
if (wrkMast.barcode == barcode) {
mast = wrkMast
@@ -629,6 +646,69 @@
}
});
},
+ // 璋冩嫧绂诲満
+ allocationOut() {
+ let that = this
+ let params = []
+ let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
+ params.push(param)
+ uni.request({
+ url: that.baseUrl + '/agvMobile/hand/control/allocationOut',
+ header: {'token': uni.getStorageSync('token')},
+ data: {devNo: that.station.devNo},
+ method: 'POST',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ setTimeout(()=> {
+ that.barcode = ''
+ that.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' })
+ }
+ }
+ });
+ },
+ allocationIn() {
+ this.$refs.allocationIn.open()
+ },
+ allocationInClose() {
+ this.$refs.allocationIn.close()
+ },
+ allocationInConfirm() {
+ let that = this
+ let params = []
+ let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
+ params.push(param)
+ uni.request({
+ url: that.baseUrl + '/agvMobile/hand/control/allocationIn',
+ header: {'token': uni.getStorageSync('token')},
+ data: {devNo: that.station.devNo, barcode: that.barcode},
+ method: 'POST',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.$refs.allocationIn.close()
+ setTimeout(()=> {
+ that.barcode = ''
+ that.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' })
+ }
+ }
+ });
+ }
+
}
}
</script>
@@ -637,13 +717,13 @@
@import url('../../../static/css/common/order.css');
.station {
- font-size: 18px;
- padding: 24rpx;
+ font-size: 15px;
+ padding: 18rpx;
}
.station-title {
- font-size: 32px;
+ font-size: 28px;
font-weight: bold;
- padding: 24rpx 0;
+ padding: 18rpx 0;
}
.station-barcode {
font-size: 24px;
--
Gitblit v1.9.1