From bb44fbbe5340a86a16f6deec50cc39a8700e80c6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 04 十一月 2025 08:45:30 +0800
Subject: [PATCH] 缓冲区入库 缓冲区出库 缓冲区组托
---
pages/home/home.vue | 19 ++++++---
pages/mat/matSelected.vue | 2
pages.json | 14 +++++--
pages/AGV/AGVOutCall.vue | 31 +++------------
pages/AGV/CachePakin.vue | 2
pages/AGV/CacheInCall.vue | 6 +--
6 files changed, 33 insertions(+), 41 deletions(-)
diff --git a/pages.json b/pages.json
index 255a050..95a0717 100644
--- a/pages.json
+++ b/pages.json
@@ -37,9 +37,9 @@
}
},
{
- "path": "pages/AGV/AGVPakin",
+ "path": "pages/AGV/CachePakin",
"style": {
- "navigationBarTitleText": "AGV缁勬墭"
+ "navigationBarTitleText": "缂撳瓨鍖虹粍鎵�"
}
},
{
@@ -61,9 +61,15 @@
}
},
{
- "path": "pages/AGV/AGVMoveCall",
+ "path": "pages/AGV/CacheInCall",
"style": {
- "navigationBarTitleText": "鍛煎彨AGV"
+ "navigationBarTitleText": "缂撳啿鍖哄叆搴�"
+ }
+ },
+ {
+ "path": "pages/AGV/AGVOutCall",
+ "style": {
+ "navigationBarTitleText": "AGV鍑哄簱"
}
},
{
diff --git a/pages/AGV/AGVMoveCall.vue b/pages/AGV/AGVOutCall.vue
similarity index 91%
copy from pages/AGV/AGVMoveCall.vue
copy to pages/AGV/AGVOutCall.vue
index c8a0fbe..90631a1 100644
--- a/pages/AGV/AGVMoveCall.vue
+++ b/pages/AGV/AGVOutCall.vue
@@ -2,30 +2,18 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鍏ュ簱绔欑偣:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orgSite" :focus="barcodeFocus">
- </view>
- <view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" >
- </view>
- <view class="item">
- <view class="code-decs">鐩爣搴撲綅:</view>
+ <view class="code-decs">鐩爣绔欑偣锛�</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" >
<!-- <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="tarSite"></uni-combox> -->
</view>
</view>
<view class="mat-list-title">
</view>
-
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
<button size="mini" type="primary" @click="combConfirm('warn')">鍛煎彨</button>
</view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
-
<!-- 绉婚櫎纭 -->
<view>
<!-- 鎻愮ず绐楃ず渚� -->
@@ -83,21 +71,21 @@
removeNum: 0,
locNo:"",
orgSite:'',
- tarSite:'e',
+ tarSite:'',
staList:[],
}
},
onLoad() {
let that = this
const eventChannel = this.getOpenerEventChannel();
- that.getSites()
+ // that.getSites()
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
mounted() {
- this.tarSite = uni.getStorageSync('tarSite')
+ // this.tarSite = uni.getStorageSync('tarSite')
},
methods: {
messageToggle(type) {
@@ -269,16 +257,9 @@
uni.setStorageSync('tarSite', this.tarSite);
uni.vibrateShort();
let that = this;
- if (that.orgSite === '') {
- this.messageText = "浜х嚎绔欎负绌�"
- this.messageToggle('error')
- return;
- }
uni.request({
- url: that.baseUrl + '/mobile/cache/agv/call',
+ url: that.baseUrl + '/mobile/cache/out/call',
data: JSON.stringify({
- orgSite: that.orgSite,
- barcode: that.barcode,
tarSite: that.tarSite
}),
method: 'POST',
@@ -363,7 +344,7 @@
}
.code-decs {
- width: 20vw;
+ width: 25vw;
font-size: 18px;
color: #303133;
}
diff --git a/pages/AGV/AGVMoveCall.vue b/pages/AGV/CacheInCall.vue
similarity index 97%
rename from pages/AGV/AGVMoveCall.vue
rename to pages/AGV/CacheInCall.vue
index c8a0fbe..79bfb64 100644
--- a/pages/AGV/AGVMoveCall.vue
+++ b/pages/AGV/CacheInCall.vue
@@ -12,7 +12,6 @@
<view class="item">
<view class="code-decs">鐩爣搴撲綅:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" >
- <!-- <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="tarSite"></uni-combox> -->
</view>
</view>
<view class="mat-list-title">
@@ -83,7 +82,7 @@
removeNum: 0,
locNo:"",
orgSite:'',
- tarSite:'e',
+ tarSite:'',
staList:[],
}
},
@@ -97,7 +96,7 @@
this.token = uni.getStorageSync('token');
},
mounted() {
- this.tarSite = uni.getStorageSync('tarSite')
+ // this.tarSite = uni.getStorageSync('tarSite')
},
methods: {
messageToggle(type) {
@@ -162,7 +161,6 @@
staResults.forEach(item => {
that.staList.push(item?.locNo)
})
- console.log(that.staList);
} else if (result.code == 403) {
uni.showToast({
title: result.msg,
diff --git a/pages/AGV/AGVPakin.vue b/pages/AGV/CachePakin.vue
similarity index 99%
rename from pages/AGV/AGVPakin.vue
rename to pages/AGV/CachePakin.vue
index f4bb153..cb3fbb5 100644
--- a/pages/AGV/AGVPakin.vue
+++ b/pages/AGV/CachePakin.vue
@@ -104,7 +104,7 @@
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 1d1b162..58337bc 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -61,18 +61,25 @@
// url: '/pingku/POrderListOut'
// },
{
- title: 'Agv缁勬墭',
- name: 'AGVPakin',
+ title: '缂撳啿鍖虹粍鎵�',
+ name: 'AgvPakin',
color: 'cyan',
cuIcon: 'order',
- url: '/AGV/AGVPakin'
+ url: '/AGV/CachePakin'
},
{
- title: 'Agv鍏ュ簱',
- name: 'AGVMoveCall',
+ title: '缂撳啿鍖哄叆搴�',
+ name: 'AgvIn',
color: 'green',
cuIcon: 'pullup',
- url: '/AGV/AGVMoveCall'
+ url: '/AGV/CacheInCall'
+ },
+ {
+ title: '缂撳啿鍖哄嚭搴�',
+ name: 'AgvOut',
+ color: 'red',
+ cuIcon: 'pulldown',
+ url: '/AGV/AGVOutCall'
},
// {
// title: '鍛煎彨Agv',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 552ed50..55b5ff5 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -28,7 +28,7 @@
<view class="form-item">
<view class="form-item-desc"><text>鏁伴噺</text></view>
<view class="form-item-content">
- <uni-number-box :value="mat.enableQty" :max="99999999" :step='1' color="#747474" @change="changeValue" />
+ <uni-number-box :value="mat.enableQty" :max="99999999" color="#747474" @change="changeValue" />
</view>
</view>
</view>
--
Gitblit v1.9.1