From 9f6dfa842d54ae12c527470e461d069f9745f6fd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 03 十月 2023 22:59:53 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 23 +++++++
pages/tzsk/AGV/AGVPakinOn.vue | 84 ++++++++++++++++++++++++++--
pages.json | 2
pages/tzsk/AGV/AGVPick.vue.vue | 38 ++++++++++++
pages/tzsk/pakin/pakin.vue | 2
pages/tzsk/AGV/AGVPakinBing.vue | 7 +-
6 files changed, 144 insertions(+), 12 deletions(-)
diff --git a/pages.json b/pages.json
index 1980aad..844d92d 100644
--- a/pages.json
+++ b/pages.json
@@ -87,7 +87,7 @@
{
"path": "pages/tzsk/AGV/AGVPick",
"style": {
- "navigationBarTitleText": "AGV鐩樼偣鎷ｆ枡"
+ "navigationBarTitleText": "AGV鐩樼偣鎷ｆ枡/瀹瑰櫒绂诲満"
}
},
{
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index db03d7d..9335e56 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -31,6 +31,27 @@
<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">
+ <input type="text" v-model="item.containerCode">
+ <uni-tag :text="item.containerCode" type="primary"></uni-tag>
+ </view>
+ </view> -->
+ <view class="list-left-item">
+ <view class="desc">閿�鍞崟鍙凤細</view>
+ <view class="left-item">
+ <input type="text" v-model="item.csocode">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璁㈠崟琛屽彿锛�</view>
+ <view class="left-item">
+ <input type="text" v-model="item.isoseq">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
<view class="list-left-item">
<view class="desc">鏂欏彿锛�</view>
<view class="left-item">
@@ -461,6 +482,8 @@
return;
}
}
+ // console.log(that.dataList);
+ // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
diff --git a/pages/tzsk/AGV/AGVPakinBing.vue b/pages/tzsk/AGV/AGVPakinBing.vue
index fe7b191..d3c5147 100644
--- a/pages/tzsk/AGV/AGVPakinBing.vue
+++ b/pages/tzsk/AGV/AGVPakinBing.vue
@@ -2,7 +2,7 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">鏂欑鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
@@ -192,11 +192,12 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ this.barcode = this.barcode.split('_')[1]
setTimeout(() => {
var len = this.barcode.length
if (len != 10) {
uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ title: '鏂欑鐮佹湁璇閲嶈瘯',
icon: "none",
position: 'top'
});
@@ -214,7 +215,7 @@
that.stationCodeFocus = true;
}, 100);
},
- // 鎵樼洏鐮佹湁璇噸缃�
+ // 鏂欑鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
diff --git a/pages/tzsk/AGV/AGVPakinOn.vue b/pages/tzsk/AGV/AGVPakinOn.vue
index ceb3452..181ab96 100644
--- a/pages/tzsk/AGV/AGVPakinOn.vue
+++ b/pages/tzsk/AGV/AGVPakinOn.vue
@@ -4,10 +4,10 @@
<view class="item">
<view class="code-decs">璁㈠崟鍙�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
- @input="orderNoInput()">
+ @input="findOrder()">
</view>
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">鏂欑鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
@@ -35,6 +35,27 @@
<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">
+ <input type="text" v-model="item.containerCode">
+ <uni-tag :text="item.containerCode" type="primary"></uni-tag>
+ </view>
+ </view> -->
+ <view class="list-left-item">
+ <view class="desc">閿�鍞崟鍙凤細</view>
+ <view class="left-item">
+ <input type="text" v-model="item.csocode">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璁㈠崟琛屽彿锛�</view>
+ <view class="left-item">
+ <input type="text" v-model="item.isoseq">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
</view>
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
@@ -169,7 +190,8 @@
matData: '',
removeNum: 0,
devNo: [],
- flag: 0
+ flag: 0,
+ tempOrderInfo: {csocode: '',isoseq: ''}
}
},
onLoad() {
@@ -180,6 +202,53 @@
this.token = uni.getStorageSync('token');
},
methods: {
+ findOrder() {
+ let that = this
+ that.tempOrderInfo.csocode = ''
+ that.tempOrderInfo.isoseq = ''
+ uni.request({
+ url: that.baseUrl + '/mobile/order/search/orderNo/auth',
+ header: {'token': uni.getStorageSync('token')},
+ data: {
+ orderNo: that.orderNo
+ },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ if(res.data && res.data[0].combMats) {
+ for (let i = 0; i < res.data[0].combMats.length; i++) {
+ that.checkMat(res.data[0].combMats[i])
+ }
+ // that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
+ // that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
+ } else {
+ uni.showToast({
+ title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+ icon: "none",
+ position: 'top'
+ })
+ }
+ } 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'
+ })
+ }
+ }
+ })
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -210,13 +279,14 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ this.barcode = this.barcode.split('_')[1]
setTimeout(() => {
var len = this.barcode.length
if (len != 10) {
this.barcode = ''
this.barcodeFocus = true
uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ title: '鏂欑鐮佹湁璇閲嶈瘯',
icon: "none",
position: 'top'
});
@@ -225,7 +295,7 @@
this.stationCodeFocuss()
}, 200)
},
- // 鎵樼洏鐮佹湁璇噸缃�
+ // 鏂欑鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
@@ -274,7 +344,7 @@
that.matnr = ''
that.matData['batch'] = ''
uni.navigateTo({
- url: "../mat/matSelected",
+ url: "../../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
res.eventChannel.emit('mat', {
@@ -443,6 +513,8 @@
return;
}
}
+ // console.log(that.dataList);
+ // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
diff --git a/pages/tzsk/AGV/AGVPick.vue.vue b/pages/tzsk/AGV/AGVPick.vue.vue
index 5112656..f8019ee 100644
--- a/pages/tzsk/AGV/AGVPick.vue.vue
+++ b/pages/tzsk/AGV/AGVPick.vue.vue
@@ -185,7 +185,6 @@
methods: {
// 瀹瑰櫒绂诲満
containerMove() {
- console.log(123);
let _this = this
var param = {'devNo' : _this.pickCode}
uni.request({
@@ -195,16 +194,33 @@
method: 'POST',
success(res) {
res = res.data
+ console.log(res);
if (res.code === 200) {
_this.pickCode = ''
_this.messageText = "绂诲満鎴愬姛"
_this.messageToggle('success')
+ } 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'
+ })
}
}
})
},
containerPick() {
- console.log(123);
let _this = this
var param = {'devNo' : _this.pickCode}
uni.request({
@@ -214,10 +230,28 @@
method: 'POST',
success(res) {
res = res.data
+ console.log(res);
if (res.code === 200) {
_this.pickCode = ''
_this.messageText = "鐩樼偣 / 鎷ｈ揣鎴愬姛"
_this.messageToggle('success')
+ } 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'
+ })
}
}
})
diff --git a/pages/tzsk/pakin/pakin.vue b/pages/tzsk/pakin/pakin.vue
index 8736b3e..3eb3816 100644
--- a/pages/tzsk/pakin/pakin.vue
+++ b/pages/tzsk/pakin/pakin.vue
@@ -466,6 +466,8 @@
return;
}
}
+ // console.log(that.dataList);
+ // return
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
--
Gitblit v1.9.1